From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java | 7 +++++++
1 files changed, 7 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 14ef6a0..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
@@ -5,6 +5,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;
@@ -19,9 +21,11 @@
@ApiModel("一起议选项")
public class ComActDiscussOptionVO {
@ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("一起议主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long discussId;
@ApiModelProperty("选项内容")
@@ -45,4 +49,7 @@
@ApiModelProperty("投票选项占比")
private BigDecimal percent;
+
+ @ApiModelProperty("是否需要填写原因")
+ private Boolean needReason;
}
--
Gitblit v1.7.1