From 155d0cb16d9549c701d9ad59e519a7fc5bc899a2 Mon Sep 17 00:00:00 2001 From: sen <sen@qq.com> Date: 星期一, 18 八月 2025 10:16:48 +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 | 6 ++++++ 1 files changed, 6 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 3b50813..f43da9d 100644 --- a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java +++ b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java @@ -391,10 +391,16 @@ */ @TableField("bill_id") private Integer billId; + /** 鍏宠仈璐﹀崟鐘舵�� */ + @Excel(name = "鍏宠仈璐﹀崟鐘舵��") + @TableField("related_bill_status") + private Integer relatedBillStatus; + /** * 鍏宠仈璐﹀崟id */ + @Excel(name = "璐﹀崟鍚嶇О") @TableField("bill_name") private String billName; -- Gitblit v1.8.0