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

zhangmei

2025-02-18 b2be113822cad796a1489b7fc52de2cb4042b57c

 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;

}