From a9dc61d23c4e38c37a6004662638dc8e2077267d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 14:00:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 bb355e1..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
@@ -18,6 +18,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.Transient;
+import springfox.documentation.annotations.ApiIgnore;
/**
* <p>
@@ -106,5 +107,19 @@
@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