From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 2285aea..76bc697 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,11 +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("问卷回答记录内容")
@@ -27,4 +29,11 @@
     private Integer type;
     @ApiModelProperty("题目选项ID")
     private Long selectionId;
+    @ApiModelProperty("答题记录id")
+    private Long reserveRecordId;
+    @ApiModelProperty("填报时间")
+    private Date time;
+    @ApiModelProperty("用户昵称")
+    private String nickName;
+
 }

--
Gitblit v1.7.1