Merge remote-tracking branch 'origin/master'

luo

2024-01-02 5fac00120acdfad0d80db84a976b605f6dc2c5a2

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/HouseResourceInfoRes.java

@@ -37,6 +37,8 @@
    private Integer elevator;
    @ApiModelProperty("是否有晾晒区（0=否，1=是）")
    private Integer dryingArea;
    @ApiModelProperty("是否有晾晒区拼接")
    private String dryingAreas;
    @ApiModelProperty("面积")
    private String houseArea;
    @ApiModelProperty("是否可养宠物（0=否，1=是）")