From ba615e67d8061233d8e2eeac6d540853e99eff34 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 二月 2025 09:59:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java | 20 ++++++++++++++++++++
1 files changed, 20 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..47e2f6a 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,9 @@
import java.util.Date;
+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;
@@ -18,18 +21,23 @@
public class ComActDiscussOptionUserVO {
@ApiModelProperty("投票记录主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("一起议选项id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long discussOptionId;
@ApiModelProperty("投票人id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("投票时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("一起议id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long discussId;
@ApiModelProperty("投票人昵称")
@@ -37,4 +45,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