Merge branch 'txb'

tangxiaobao

2021-08-16 92d88fe1dcd963fa866da0e89108d2e99f63eb90

 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;
}