From 424d9748add1a2ade5ca33e8981e5bc4e7a03ab6 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 09:27:15 +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 | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 f59a7f5..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,15 +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 BigDecimal settlementAmount;
/** 寮�绁ㄧ姸鎬� */
@Excel(name = "寮�绁ㄧ姸鎬�")
--
Gitblit v1.8.0