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

101captain

2021-10-18 92ad195603db4b075d0ad1d7cf7471b15f2cc126

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/PageBuildingListAdminVo.java

@@ -36,7 +36,7 @@
    private Integer unitTotal;

    @ApiModelProperty("楼层数")
    private Integer buildFloorSum;
    private String buildFloorSum;

    @ApiModelProperty("总户数")
    private Integer houseNum;