From 0a32ecc49bc4acd885096562e809381d28b3d1d7 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 14:37:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 035fa15..0059cad 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
@@ -163,6 +163,14 @@
@TableField("refund_amount")
private BigDecimal refundAmount;
+ @ApiModelProperty(value = "累计服务费")
+ @TableField("service_charge")
+ private BigDecimal serviceCharge;
+
+ @ApiModelProperty(value = "累计电费")
+ @TableField("electrovalence")
+ private BigDecimal electrovalence;
+
@ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
@TableField("refund_status")
private Integer refundStatus;
@@ -181,12 +189,5 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
-
- @ApiModelProperty(value = "累计服务费")
- @TableField("service_charge")
- private BigDecimal serviceCharge;
-
- @ApiModelProperty(value = "累计电费")
- @TableField("electrovalence")
- private BigDecimal electrovalence;
+
}
--
Gitblit v1.7.1