From b0a0cbf6cd8f3beacbca9a962b45b0baf3935176 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 11:15:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
index 6407878..7f0b27b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
@@ -25,6 +25,7 @@
     private Long id;
 
     @ApiModelProperty("一起议主键")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long discussId;
 
     @ApiModelProperty("选项内容")
@@ -48,4 +49,7 @@
 
     @ApiModelProperty("投票选项占比")
     private BigDecimal percent;
+
+    @ApiModelProperty("是否需要填写原因")
+    private Boolean needReason;
 }

--
Gitblit v1.7.1