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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -14,7 +14,13 @@
@ApiModel("党组织")
public class PartyOrganizationVO {
    @ApiModelProperty(value = "党组织id")
    private String id;
    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;
}