Merge branch 'dev'

101captain

2022-03-14 85cf42314fc04a637f1a44e78c1e476a445bf0f3

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

@@ -126,6 +126,9 @@
    @ApiModelProperty("已投票记录列表")
    private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;

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

    @ApiModelProperty("已参与投票人数")
    private Integer votedPersonNum;