From 1395356d3b3423f8cb90ded6b5fe8eb2eb52af23 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 10:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
index 663653b..8a184b1 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivableBill.java
@@ -54,20 +54,20 @@
@Excel(name = "搴旂粨绠楅噾棰�")
@TableField("total_amount")
- private Long totalAmount;
+ private BigDecimal totalAmount;
/** 宸茬粨绠楅噾棰� */
@Excel(name = "宸茬粨绠楅噾棰�")
@TableField("settled_amount")
- private Long settledAmount;
+ private BigDecimal settledAmount;
/**
* 鏈缁撶畻閲戦
*/
@TableField(exist = false)
- private Long settlementAmount;
+ private BigDecimal settlementAmount;
/** 寮�绁ㄧ姸鎬� */
@Excel(name = "寮�绁ㄧ姸鎬�")
--
Gitblit v1.8.0