From 79341c13ae4605ba32db403ebcb8937331b762c5 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 12 Aug 2025 16:40:29 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=8812=E6=97=A5=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java | 3 +++ src/main/java/com/example/demo/domain/vo/coin/RefundUser.java | 3 +++ src/main/resources/mapper/RechargeMapper.xml | 3 ++- src/main/resources/mapper/RefundMapper.xml | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java index fb540a2..de46947 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java @@ -74,6 +74,9 @@ public class RechargeUser { @ExcelProperty("创建时间") private Date payTime; // 创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @ExcelProperty("审核时间") + private Date auditTime; // 审核时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @ExcelIgnore private Date startTime; // 开始时间 @ExcelIgnore diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java index 548e784..d17c42b 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java @@ -58,6 +58,9 @@ public class RefundUser { @ExcelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 创建时间 + @ExcelProperty("审核时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date auditTime; // 审核时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @ExcelIgnore private Date startTime; // 开始时间 diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index 52e072c..361f553 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -89,7 +89,8 @@ ugr.remark AS remark, ugr.admin_id AS adminId, a.admin_name AS adminName, - ugr.pay_time AS payTime + ugr.pay_time AS payTime, + ugr.audit_time AS auditTime FROM user_gold_record ugr left JOIN user u ON u.jwcode = ugr.jwcode left JOIN admin a ON ugr.admin_id = a.id diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index e40f68a..3473a74 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -88,7 +88,8 @@ ugr.task_gold AS taskGold, ugr.remark AS remark, a.admin_name AS adminName, - ugr.create_time AS createTime + ugr.create_time AS createTime, + ugr.audit_time AS auditTime FROM user_gold_record ugr left JOIN user u ON u.jwcode = ugr.jwcode