From 3d3fa72ebf55f841c8ede01c59347af5e44b773b Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
index 914308c..3b50813 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
@@ -176,6 +176,23 @@
@TableField("estimated_total_cost")
private BigDecimal estimatedTotalCost;
+ /** 纭鎬绘敹鍏� */
+ @Excel(name = "纭鎬绘敹鍏�")
+ @TableField("confirmed_total_income")
+ private BigDecimal confirmedTotalIncome;
+ /** 纭鎬绘垚鏈� */
+ @Excel(name = "纭鎬绘垚鏈�")
+ @TableField("confirmed_total_cost")
+ private BigDecimal confirmedTotalCost;
+
+ /**鏄惁鍖归厤鏀跺叆(0:鏈尮閰�;1:宸插尮閰�)*/
+ @TableField("is_income_matched")
+ private Integer isIncomeMatched;
+
+ /**鏄惁鍖归厤鎴愭湰(0:鏈尮閰�;1:宸插尮閰�)*/
+ @TableField("is_cost_matched")
+ private Integer isCostMatched;
+
/** 棰勪及鍒╂鼎 */
@Excel(name = "棰勪及鍒╂鼎")
--
Gitblit v1.8.0