From 76ed3735c23da4b7ef97b8a0f365facbc14f6903 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期日, 27 六月 2021 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
index 50ddc2a..3e5ac76 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.visit;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import io.swagger.annotations.ApiModel;
@@ -117,7 +118,7 @@
private Boolean exception;
@ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
- private String tableContentJson;
+ private JSONObject tableContentJson;
@ApiModelProperty(value = "创建人")
private Long createBy;
@@ -133,6 +134,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
+ @ApiModelProperty(value = "异常选项")
+ private List<String> optionList;
+
@ApiModelProperty(value = "音频列表")
List<String> vosList;
--
Gitblit v1.7.1