Merge branch 'hemenkou_dev' into dev

101captain

2022-03-14 0965590521cd58e6fcc8d2ac97f4fa6b01e3e67e

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

@@ -13,7 +13,7 @@
@ApiModel
public class FourMemberDetailVO {
    @ApiModelProperty("基础数据及房屋数据")
    private ComMngPopulationVO comMngPopulationVO;
    private ComMngPopulationNoSecretVO comMngPopulationVO;
    @ApiModelProperty("党员数据")
    private ComPbMemberVO partyBuildingMemberVO;
}