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/EstimatedReceivable.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
index 81cf126..b890a00 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
@@ -64,12 +64,18 @@
@TableField("fee_name")
private String feeName;
+ /** 璐圭敤绫诲瀷 */
+// @Excel(name = "璐圭敤绫诲瀷")
+
+ @TableField("fee_type")
+ private Integer feeType;
+
/** 棰勪及璐圭敤閲戦 */
@Excel(name = "棰勪及璐圭敤閲戦")
@TableField("estimated_amount")
- private Long estimatedAmount;
+ private BigDecimal estimatedAmount;
/** 甯佸埗 */
--
Gitblit v1.8.0