From 984c102eb4e632985e45b7c4be1545c53c87b589 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 十二月 2024 21:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v5' into master-v5
---
src/main/java/com/mzl/flower/entity/wallet/WalletDO.java | 10 ++++++++--
1 files changed, 8 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 9c33979..5774d2b 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
@@ -30,7 +30,7 @@
* 供应商ID
*/
@ApiModelProperty(value = "供应商Id")
- private String supplierId;
+ private Long supplierId;
/**
* 总金额
@@ -72,7 +72,13 @@
* 总交易金额
*/
@ApiModelProperty(value = "总交易金额")
- private String totalTransactionAmount;
+ private BigDecimal totalTransactionAmount;
+
+ /**
+ * 总交易金额
+ */
+ @ApiModelProperty(value = "已结算金额")
+ private BigDecimal settledAmount;
}
--
Gitblit v1.9.3