From cd7bec2448443f88eee6f73df68df829fc95eed9 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 29 六月 2021 11:25:24 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
index 9a839b6..01275c0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
@@ -1,7 +1,10 @@
 package com.panzhihua.common.model.vos.visit;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.panzhihua.common.enums.EventTasksStatusEnum;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,31 +19,55 @@
  */
 @ApiModel("app走访任务VO")
 @Data
+@EncryptDecryptClass
 public class AppVisitTasksVO implements Serializable {
     private static final long serialVersionUID = -5758072851661612412L;
 
     @ApiModelProperty("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty("需走访人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long visiterId;
+
+    @ApiModelProperty("需走访人姓名")
+    private String visiterName;
+
     @ApiModelProperty("网格员id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long gridMember;
 
     @ApiModelProperty("网格员")
     private String gridMemberName;
 
     @ApiModelProperty("处理人id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long dellUserId;
 
     @ApiModelProperty("处理人")
     private String dellUserName;
 
     @ApiModelProperty("需走访人电话")
+    @EncryptDecryptField
     private String visiterTele;
 
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date submitDate;
 
+
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createAt;
+
+    @ApiModelProperty("创建人")
+    private String creator;
+
+    @ApiModelProperty("撤销时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cancelTime;
+
     private Integer eventStatus;
 
     @ApiModelProperty("状态")

--
Gitblit v1.7.1