From 02c65a3db81026b8b3b322d921ddf46e47f981fa Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 14 二月 2025 14:11:30 +0800
Subject: [PATCH] 开票信息

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 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 8617e44..38f218b 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
@@ -8,6 +8,7 @@
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
@@ -16,6 +17,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Transient;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * <p>
@@ -39,6 +42,10 @@
     @ApiModelProperty(value = "合同id")
     @TableField("contract_id")
     private String contractId;
+
+    @ApiModelProperty(value = "合同编号")
+    @TableField("contract_number")
+    private String contractNumber;
 
     @ApiModelProperty(value = "应缴费")
     @TableField("payable_fees_money")
@@ -92,13 +99,27 @@
     @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")
     private String voucher;
 
+    @ApiModelProperty(value = "t_bill_confirm表确认单关联ID")
+    @TableField("confirm_id")
+    private String confirmId;
+
+    /**
+     * 抵扣金额
+     */
+    @TableField(exist = false)
+    private BigDecimal deductionMoney;
+    /**
+     * 抵扣前欠费金额
+     */
+    @TableField(exist = false)
+    private BigDecimal preOutstand;
 
 }

--
Gitblit v1.7.1