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

huanghongfa

2021-08-15 4ca86cb13b25ece24a323300294b0507926b37a2

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

@@ -36,5 +36,5 @@
    private Integer num;

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