Merge branch 'txb'

tangxbbaba

2021-08-14 0c8c1b9423d9a1d2dc16649ed22267145aa589a3

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

@@ -34,4 +34,7 @@

    @ApiModelProperty("投票数量")
    private Integer num;

    @ApiModelProperty("是否已经投票 1 是 0 否")
    private Integer haveVote = 0;
}