From b2a62864b8367c80921c9df7614dd3b6c667801b Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 28 六月 2021 15:54:22 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 3e5ac76..8757001 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
@@ -2,6 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.dtos.EventResourceDTO;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +22,7 @@
* */
@Data
@ApiModel("重点人群走访记录详细返回参数")
+@EncryptDecryptClass
public class EventVisitingTasksDetailsVO {
@ApiModelProperty(value = "id")
@@ -49,6 +53,7 @@
private Integer visiterSex;
@ApiModelProperty(value = "需走访人电话")
+ @EncryptDecryptField
private String visiterTele;
@ApiModelProperty(value = "需走访人居住地址")
@@ -138,13 +143,13 @@
private List<String> optionList;
@ApiModelProperty(value = "音频列表")
- List<String> vosList;
+ List<EventResourceDTO> vosList;
@ApiModelProperty(value = "图片列表")
- List<String> imgList;
+ List<EventResourceDTO> imgList;
@ApiModelProperty(value = "视频列表")
- List<String> videoList;
+ List<EventResourceDTO> videoList;
}
--
Gitblit v1.7.1