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

luofl

2025-03-24 43222d3b7aacc0ede6072f579f14563f53e399a7

 ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java

@@ -22,6 +22,11 @@
     */
    @ApiModelProperty("租户ID")
    private String userId;
    /**
     * 账单类型
     */
    @ApiModelProperty("账单类型 1=租金 2=押金 3=生活费用 4=房屋验收")
    private Integer billType;