From 1cb4ef53a80e600d03d6183bf9ac58fe5207aa0b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 八月 2024 17:05:02 +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 |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 58d079d..9351b4e 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
@@ -155,4 +155,17 @@
     @TableField("refund_time")
     private LocalDateTime refundTime;
 
+
+    @ApiModelProperty(value = "支付时间")
+    @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