Merge branch 'master' of https://gitee.com/xiaochen991015/xizang into xizan...

zhangmei

2025-02-14 728a54cc02ff66e38bc8719ecc0f3155e597084c

 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;

}