From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 08 十月 2021 11:30:14 +0800 Subject: [PATCH] bug修复 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java index 05335cf..517b47e 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java @@ -102,18 +102,38 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; - @ApiModelProperty("参与人数") + @ApiModelProperty("参与讨论人数") private Integer joinNum; @ApiModelProperty("单张图片宽度") private BigDecimal imgWidth; @ApiModelProperty("单张图片高度") - private BigDecimal heightWidth; + private BigDecimal imgHeight; @ApiModelProperty("是否可重复投票(1.是 2.否)") private Integer isRepeat; @ApiModelProperty("每人票数") private Integer count; + + @ApiModelProperty("议事投票评论列表") + private List<ComActDiscussCommentVO> discussCommentList; + + @ApiModelProperty("剩余可投票数") + private Integer remainingVotes; + + @ApiModelProperty("已投票记录列表") + private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList; + + @ApiModelProperty("已参与投票人数") + private Integer votedPersonNum; + + /** + * 类型 1 议事 2 投票 + */ + public interface type{ + int ys = 1; + int tp = 2; + } } -- Gitblit v1.7.1