From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 16 ++++++++++++++--
1 files changed, 14 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..1b65ebf 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,18 @@
@ApiModelProperty("议事投票评论列表")
private List<ComActDiscussCommentVO> discussCommentList;
+ @ApiModelProperty("剩余可投票数")
+ private Integer remainingVotes;
+
+ @ApiModelProperty("已投票记录列表")
+ private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;
+
+ @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
+ private Integer contentType;
+
+ @ApiModelProperty("已参与投票人数")
+ private Integer votedPersonNum;
+
/**
* 类型 1 议事 2 投票
*/
--
Gitblit v1.7.1