From 193945d70b561bc96bb608b47b9b2e4dba3b45b2 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 07 三月 2025 11:40:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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