Merge remote-tracking branch 'origin/master'

CeDo

2021-04-12 c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724

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

@@ -19,6 +19,4 @@
    private Integer joinCount;
    @ApiModelProperty("社区ID")
    private Long communityId;
    @ApiModelProperty("问卷参与者类型 0 全部 1 志愿者 2 党员")
    private Integer parterType;
}