Merge remote-tracking branch 'origin/master' into master

hhhyyq

2021-03-17 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java

@@ -17,6 +17,10 @@
    private Long id;
    @ApiModelProperty(value = "党组织名字")
    private String name;
    @ApiModelProperty(value = "状态")
    private Integer status;
    @ApiModelProperty(value = "党员人数")
    private Integer countPerson;
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;
}