From 71d710e252dccfaf35804c5d0e6a3f00dac9be2b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 11 九月 2024 09:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 5cfac91..a548f5d 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
@@ -159,7 +159,7 @@
@TableField("refund_code")
private String refundCode;
@ApiModelProperty(value = "退款原因")
- @TableField("refund_reason")
+ @TableField(exist = false)
private String refundReason;
@ApiModelProperty(value = "退款金额")
@@ -192,7 +192,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
-
+ @ApiModelProperty(value = "实时需求电流")
+ @TableField("need_elec")
+ private BigDecimal needElec;
@ApiModelProperty(value = "站点名称")
@TableField(exist = false)
private String siteName;
--
Gitblit v1.7.1