From 8ad5a84a2675d85977cbfb6020f4905f4dd8090a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 15:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 177e0f3..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
@@ -39,9 +39,9 @@
@TableField("shop_id")
private Integer shopId;
- @ApiModelProperty(value = "变动类型（1=门店分佣，2=下级门店分佣，3=门店服务费）")
+ @ApiModelProperty(value = "变动类型（1=绑定门店分佣,2=下级门店分佣,3=核销门店服务费，4=提现）")
@TableField("type")
- @Excel(name = "变更类型",readConverterExp = "1=门店分佣,2=下级门店分佣,3=门店服务费，4=关联用户分佣")
+ @Excel(name = "变更类型",readConverterExp = "1=绑定门店分佣,2=下级门店分佣,3=核销门店服务费,4=提现")
private Integer type;
@ApiModelProperty(value = "历史余额")
@@ -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