Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

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

@@ -25,10 +25,16 @@
    @ApiModelProperty("选项内容")
    private String optionContent;

    @ApiModelProperty("选项图片url")
    private String optionUrl;

    @ApiModelProperty("create_at")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

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

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