From d0ae6a6e9a8123f4869417b46e5d7423f8ca66d6 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 01 十月 2021 06:29:34 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
index f814ddf..1db85be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
@@ -1,10 +1,13 @@
package com.panzhihua.common.model.vos.community;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
@Data
@ApiModel("问卷回答记录内容")
@@ -20,7 +23,21 @@
@ApiModelProperty("用户姓名")
private String userName;
@ApiModelProperty("创建时间")
- private String createAt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
@ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
private Integer type;
+ @ApiModelProperty("题目选项ID")
+ private Long selectionId;
+ @ApiModelProperty("答题记录id")
+ private Long reserveRecordId;
+ @ApiModelProperty("题目id")
+ private Long reserveSubId;
+ @ApiModelProperty("填报时间")
+ private Date time;
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+ @ApiModelProperty("选项类型（0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11文件上传）")
+ private Integer optionType;
+
}
--
Gitblit v1.7.1