Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-04-03 f625ae7edfa835f5c72967a8bcc1584df8ab61ec

 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;

}