From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/entity/wallet/WalletDO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 2f240e0..5774d2b 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
@@ -72,7 +72,13 @@
* 总交易金额
*/
@ApiModelProperty(value = "总交易金额")
- private String totalTransactionAmount;
+ private BigDecimal totalTransactionAmount;
+
+ /**
+ * 总交易金额
+ */
+ @ApiModelProperty(value = "已结算金额")
+ private BigDecimal settledAmount;
}
--
Gitblit v1.9.3