From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/WalletStatisticsDetail.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/WalletStatisticsDetail.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/WalletStatisticsDetail.java
index 76215da..5a9932c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/WalletStatisticsDetail.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/WalletStatisticsDetail.java
@@ -11,22 +11,19 @@
@Data
public class WalletStatisticsDetail {
- /**
- * 门店名称
- */
- @ApiModelProperty(value = "门店名称")
- private String shopName;
/**
* 用户姓名
*/
@ApiModelProperty(value = "用户姓名")
+ @Excel(name = "用户姓名")
private String userName;
/**
* 联系电话
*/
@ApiModelProperty(value = "联系电话")
+ @Excel(name = "联系电话")
private String userPhone;
@ApiModelProperty("类型：1充值2提现3红包4分佣5商城购物6订单取消回退7门店提现")
@@ -39,6 +36,7 @@
@ApiModelProperty(value = "变更时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
@@ -46,4 +44,10 @@
*/
@ApiModelProperty(value = "变更数量")
private BigDecimal changeAmount;
+ /**
+ * 变更数量
+ */
+ @ApiModelProperty(value = "变更数量--带金额符号")
+ @Excel(name = "变更数量")
+ private String changeAmountString;
}
--
Gitblit v1.7.1