Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-27 9c8735c70d86a31081340ca78bb2b538ed11a6e5

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