From b83f20fd0d9be4ed0dbba7f22f82f71b839044eb Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 10:25:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
index e0328e6..d2f0547 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
@@ -51,10 +51,13 @@
     @ApiModelProperty(value = "变动金额")
     @TableField("variable_amount")
     private BigDecimal variableAmount;
+    @ApiModelProperty(value = "变动金额")
+    @TableField(exist = false)
+    @Excel(name = "变更数量")
+    private String variableAmountString;
 
     @ApiModelProperty(value = "变动后余额")
     @TableField("balance")
-    @Excel(name = "变更后数量")
     private BigDecimal balance;
 
     @ApiModelProperty(value = "变动时间")

--
Gitblit v1.7.1