From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 3306a4a..5704cc8 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
@@ -38,9 +38,11 @@
private String address;
@ApiModelProperty("发布人主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("社区主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
@ApiModelProperty("create_at")
@@ -135,6 +137,12 @@
@ApiModelProperty("已参与投票人数")
private Integer votedPersonNum;
+ @ApiModelProperty("投票范围（1.全部居民 2.志愿者 3.党员）")
+ private Integer voteScope;
+
+ @ApiModelProperty("是否需要签名")
+ private Boolean needSign;
+
/**
* 类型 1 议事 2 投票
*/
--
Gitblit v1.7.1