From f3a33392a04c30ec58282e3ff68ae58fc5b7a971 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期四, 16 十月 2025 17:32:04 +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 | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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 8609cf5..f43da9d 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 = "棰勪及鍒╂鼎")
@@ -364,6 +381,28 @@
/**涓氬姟id淇敼鐢�*/
@TableField(exist = false)
private Integer serviceId;
+ /**
+ * 鏄惁鐢熸垚杩囧叆璐�0鍚�1鏄�
+ */
+ @TableField("is_create")
+ private Integer isCreate;
+ /**
+ * 鍏宠仈璐﹀崟id
+ */
+ @TableField("bill_id")
+ private Integer billId;
+ /** 鍏宠仈璐﹀崟鐘舵�� */
+ @Excel(name = "鍏宠仈璐﹀崟鐘舵��")
+ @TableField("related_bill_status")
+ private Integer relatedBillStatus;
+
+
+ /**
+ * 鍏宠仈璐﹀崟id
+ */
+ @Excel(name = "璐﹀崟鍚嶇О")
+ @TableField("bill_name")
+ private String billName;
public String getActualDepartureTimeBegin() {
return actualDepartureTimeBegin;
--
Gitblit v1.8.0