From fc4813199d911650aa18d9175448a26791aef4bf Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 18 八月 2022 16:18:34 +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/ComActDiscussOptionUserVO.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java
index d3dc3c1..38ca95c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java
@@ -2,6 +2,8 @@
import java.util.Date;
+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;
@@ -21,15 +23,18 @@
private Long id;
@ApiModelProperty("一起议选项id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long discussOptionId;
@ApiModelProperty("投票人id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("投票时间")
private Date createAt;
@ApiModelProperty("一起议id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long discussId;
@ApiModelProperty("投票人昵称")
@@ -37,4 +42,16 @@
@ApiModelProperty("投票人头像")
private String imageUrl;
+
+ @ApiModelProperty("签名")
+ private String signUrl;
+
+ @ApiModelProperty("投票原因")
+ private String reason;
+
+ @ApiModelProperty("选项内容")
+ private String optionContent;
+
+ @ApiModelProperty("选项图片url")
+ private String optionUrl;
}
--
Gitblit v1.7.1