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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java

@@ -60,4 +60,9 @@

    @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
    private Integer contentType;

    @ApiModelProperty(value = "是否党员", hidden = true)
    private Integer isPbMember;
    @ApiModelProperty(value = "是否志愿者", hidden = true)
    private Integer isVolunteer;
}