From f93b1617d28c9d353fae628bfb86e0c15fa07579 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 31 十月 2024 11:59:21 +0800
Subject: [PATCH] 1.提现-增加明细记录 2.报表-财务报表-增加总销售扎数统计，将原销售扎数改成实际销售扎数
---
src/main/java/com/mzl/flower/entity/wallet/WalletDO.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
index 7c1fcc2..5774d2b 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,7 +17,7 @@
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("t_wallet")
-public class WalletDO extends BaseEntity {
+public class WalletDO extends BaseAutoEntity {
/**
@@ -71,7 +72,13 @@
* 总交易金额
*/
@ApiModelProperty(value = "总交易金额")
- private String totalTransactionAmount;
+ private BigDecimal totalTransactionAmount;
+
+ /**
+ * 总交易金额
+ */
+ @ApiModelProperty(value = "已结算金额")
+ private BigDecimal settledAmount;
}
--
Gitblit v1.9.3