Merge branch 'base_data' into test

101captain

2021-09-29 de291fdd4ed240c6f5c2c70070beebbb323dc4f6

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

@@ -189,6 +189,9 @@
    @ApiModelProperty("与户主关系名称")
    private String relationName;

    @ApiModelProperty("身份证无加密字段")
    private String cardNoStr;

    @ApiModelProperty("房屋列表")
    private List<ComMngHouseVo> houseList;