From e3588d4435ebec31304578ebfe79f9a046a67a03 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 15 八月 2025 15:45:54 +0800
Subject: [PATCH] 修改关联
---
service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 6f580d0..914308c 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
@@ -167,21 +167,21 @@
@Excel(name = "棰勪及鎬绘敹鍏�")
@TableField("estimated_total_income")
- private Long estimatedTotalIncome;
+ private BigDecimal estimatedTotalIncome;
/** 棰勪及鎬绘垚鏈� */
@Excel(name = "棰勪及鎬绘垚鏈�")
@TableField("estimated_total_cost")
- private Long estimatedTotalCost;
+ private BigDecimal estimatedTotalCost;
/** 棰勪及鍒╂鼎 */
@Excel(name = "棰勪及鍒╂鼎")
@TableField("estimated_profit")
- private Long estimatedProfit;
+ private BigDecimal estimatedProfit;
/** 鐢靛瓙閿� */
@@ -364,6 +364,22 @@
/**涓氬姟id淇敼鐢�*/
@TableField(exist = false)
private Integer serviceId;
+ /**
+ * 鏄惁鐢熸垚杩囧叆璐�0鍚�1鏄�
+ */
+ @TableField("is_create")
+ private Integer isCreate;
+ /**
+ * 鍏宠仈璐﹀崟id
+ */
+ @TableField("bill_id")
+ private Integer billId;
+
+ /**
+ * 鍏宠仈璐﹀崟id
+ */
+ @TableField("bill_name")
+ private String billName;
public String getActualDepartureTimeBegin() {
return actualDepartureTimeBegin;
--
Gitblit v1.8.0