From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 13 +++++++++++--
1 files changed, 11 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 51f43b2..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,14 +102,14 @@
@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;
@@ -120,6 +120,15 @@
@ApiModelProperty("议事投票评论列表")
private List<ComActDiscussCommentVO> discussCommentList;
+ @ApiModelProperty("剩余可投票数")
+ private Integer remainingVotes;
+
+ @ApiModelProperty("已投票记录列表")
+ private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;
+
+ @ApiModelProperty("已参与投票人数")
+ private Integer votedPersonNum;
+
/**
* 类型 1 议事 2 投票
*/
--
Gitblit v1.7.1