From 37466a6157e0c447d2fef3b847b7e9d9a1992503 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 03 八月 2022 16:22:18 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 19 ++++++++++++++++++-
1 files changed, 18 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 1b17241..3306a4a 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
@@ -6,6 +6,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,6 +22,7 @@
@ApiModel("一起议议详情")
public class ComActDiscussVO {
@ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("主题")
@@ -109,7 +112,7 @@
private BigDecimal imgWidth;
@ApiModelProperty("单张图片高度")
- private BigDecimal heightWidth;
+ private BigDecimal imgHeight;
@ApiModelProperty("是否可重复投票（1.是 2.否）")
private Integer isRepeat;
@@ -117,12 +120,26 @@
@ApiModelProperty("每人票数")
private Integer count;
+ @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 投票
+ */
+ public interface type{
+ int ys = 1;
+ int tp = 2;
+ }
}
--
Gitblit v1.7.1