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 |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 4dba15b..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,12 +11,6 @@
 
 @Data
 public class WalletStatisticsDetail {
-    /**
-     * 门店名称
-     */
-    @ApiModelProperty(value = "门店名称")
-    @Excel(name = "门店名称")
-    private String shopName;
 
     /**
      * 用户姓名
@@ -49,6 +43,11 @@
      * 变更数量
      */
     @ApiModelProperty(value = "变更数量")
-    @Excel(name = "变更数量")
     private BigDecimal changeAmount;
+    /**
+     * 变更数量
+     */
+    @ApiModelProperty(value = "变更数量--带金额符号")
+    @Excel(name = "变更数量")
+    private String changeAmountString;
 }

--
Gitblit v1.7.1