From cd0b3f63b1ded4a7f22ee3140d189ff9cb00a745 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 六月 2022 17:27:27 +0800
Subject: [PATCH] Merge branch 'huacheng_uu' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 6c1a65f..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
@@ -109,7 +109,7 @@
private BigDecimal imgWidth;
@ApiModelProperty("单张图片高度")
- private BigDecimal heightWidth;
+ private BigDecimal imgHeight;
@ApiModelProperty("是否可重复投票（1.是 2.否）")
private Integer isRepeat;
@@ -126,6 +126,9 @@
@ApiModelProperty("已投票记录列表")
private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;
+ @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
+ private Integer contentType;
+
@ApiModelProperty("已参与投票人数")
private Integer votedPersonNum;
--
Gitblit v1.7.1