From 86c9e373f05d67cc3cd11657f6d9a93bebb16c53 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 七月 2021 17:39:25 +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 | 15 ++++++++++++++-
1 files changed, 14 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 3e09304..75e0484 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,8 @@
import com.alibaba.fastjson.JSONObject;
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.model.dtos.EventResourceDTO;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
@@ -26,15 +28,19 @@
public class EventVisitingTasksDetailsVO {
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "网格员所处的街道")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMemberStreet;
@ApiModelProperty(value = "网格员所处社区")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMemberCommunity;
@ApiModelProperty(value = "网格员")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMember;
@ApiModelProperty(value = "网格员名字")
@@ -44,6 +50,7 @@
private String gridMenberTele;
@ApiModelProperty(value = "需走访人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long visiterId;
@ApiModelProperty(value = "需走访人名字")
@@ -55,6 +62,9 @@
@ApiModelProperty(value = "需走访人电话")
@EncryptDecryptField
private String visiterTele;
+
+ @ApiModelProperty(value = "需走访人电话")
+ private String visiterPhone;
@ApiModelProperty(value = "需走访人居住地址")
private String visiterAddress;
@@ -94,6 +104,7 @@
private Integer dellType;
@ApiModelProperty(value = "处理人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long dellUserId;
@ApiModelProperty(value = "处理人名称")
@@ -120,12 +131,13 @@
private Date submitDate;
@ApiModelProperty(value = "是否异常行为:0否，1是")
- private Boolean exception;
+ private Integer exception;
@ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
private JSONObject tableContentJson;
@ApiModelProperty(value = "创建人")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long createBy;
@ApiModelProperty(value = "创建事件")
@@ -133,6 +145,7 @@
private Date createAt;
@ApiModelProperty(value = "修改人")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long updateBy;
@ApiModelProperty(value = "修改时间")
--
Gitblit v1.7.1