From a32daacfc4f6209b9b794a0d280d217607f8a18c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 5 Aug 2023 14:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=96=87=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/pile/vo/web/OrderListVO.java | 6 ++++++ .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 1 + 2 files changed, 7 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java index 9dc40b133..f161bb069 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java @@ -176,6 +176,12 @@ public class OrderListVO { @Excel(name = "结算金额") private String settleAmount; + /** + * 结算时间 + */ + @Excel(name = "结算时间") + private String settlementTime; + /** * 创建日期 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index f5b201c51..10da2b993 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -180,6 +180,7 @@ t1.order_amount as orderAmount, t1.virtual_amount as virtualAmount, t1.settle_amount as settleAmount, + t1.settlement_time as settlementTime, t1.start_soc as startSoc, t1.end_soc as endSoc, t1.charge_start_time as chargeStartTime,