Merge branch 'master' into test

CeDo

2021-06-17 1c8ed0e3e18d6ed97879cb2925db914a9d487314

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java

@@ -29,6 +29,9 @@
    @ApiModelProperty("房屋地址")
    private String houseName;

    @ApiModelProperty("房屋地址简称")
    private String houseShortName;

    @ApiModelProperty("父类地址编码")
    private String parentCode;