From 1defb3f6954f525c04e0bc48604c2c4759120452 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 03 十一月 2024 12:31:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index e350f71..2562032 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -27,6 +27,10 @@
public class TChargingOrder extends BasePojo {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "累计退款金额 前端忽略")
+ @TableField(exist = false)
+
+ private BigDecimal refundAmount1;
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.NONE)
@@ -34,7 +38,9 @@
@ApiModelProperty(value = "序号")
@TableField(exist = false)
private Integer xuhao;
-
+ @ApiModelProperty(value = "退款描述")
+ @TableField(exist = false)
+ private String refundContent;
@ApiModelProperty(value = "订单编号")
@TableField("code")
private String code;
@@ -206,6 +212,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("refund_time")
private LocalDateTime refundTime;
+ @ApiModelProperty(value = "退款成功时间")
+ @TableField(exist = false)
+ private String refundTime1;
@ApiModelProperty(value = "总电量")
@TableField("total_electricity")
private BigDecimal totalElectricity;
--
Gitblit v1.7.1