From e73ee4cf940ce406a016cb46e2f265d04cf9c6dc Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期六, 08 二月 2025 12:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
index 7abdadb..a298bb2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
@@ -40,6 +40,10 @@
     @TableField("contract_id")
     private String contractId;
 
+    @ApiModelProperty(value = "合同编号")
+    @TableField("contract_number")
+    private String contractNumber;
+
     @ApiModelProperty(value = "应缴费")
     @TableField("payable_fees_money")
     private BigDecimal payableFeesMoney;
@@ -92,9 +96,9 @@
     @TableField("bank_serial_number")
     private String bankSerialNumber;
 
-    @ApiModelProperty(value = "实际收款")
-    @TableField("actual_money")
-    private BigDecimal actualMoney;
+    @ApiModelProperty(value = "欠费金额")
+    @TableField("outstanding_money")
+    private BigDecimal outstandingMoney;
 
     @ApiModelProperty(value = "凭证上传")
     @TableField("voucher")

--
Gitblit v1.7.1