Merge remote-tracking branch 'origin/master'

Null

2021-03-18 f2d86046f9b5a122e7593a95b6ff3ce911ac98b6

 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;