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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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