From fa1c1ea203559ef7cbb93dc9097fc703c6a52d2e Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 11 二月 2025 11:31:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java
index 80e8157..ee01b72 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java
@@ -57,4 +57,8 @@
@TableField("total_amount")
private BigDecimal totalAmount;
+ @ApiModelProperty(value = "费用类型 1=水费 2=电费")
+ @TableField("live_type")
+ private Integer liveType;
+
}
--
Gitblit v1.7.1