Merge remote-tracking branch 'origin/dev' into dev

luofl

2025-03-24 43222d3b7aacc0ede6072f579f14563f53e399a7

 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;

}