From 2cdbb69378ac6af3786b8800977de437ba53241c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 15:47:41 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 11 +++++++++++
1 files changed, 11 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 1b65ebf..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
@@ -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("主题")
@@ -35,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")
@@ -132,6 +137,12 @@
@ApiModelProperty("已参与投票人数")
private Integer votedPersonNum;
+ @ApiModelProperty("投票范围（1.全部居民 2.志愿者 3.党员）")
+ private Integer voteScope;
+
+ @ApiModelProperty("是否需要签名")
+ private Boolean needSign;
+
/**
* 类型 1 议事 2 投票
*/
--
Gitblit v1.7.1