Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-31 c8ffbff633fdf61b76678ff3ca7e1916f59db7ed

 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;
}