From c195b4ebc79b60539083f7089a5f878c1604fce9 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 30 六月 2021 18:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java
index 3bd33ee..98b536c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java
@@ -1,11 +1,11 @@
package com.panzhihua.service_grid.model.dos;
-import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
@@ -20,6 +20,7 @@
* */
@Data
@TableName("event_visiting_tasks")
+@EncryptDecryptClass
public class EventVisitingTasksDO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -64,6 +65,7 @@
/**
* 需走访人电话 列: visiter_tele
*/
+ @EncryptDecryptField
private String visiterTele;
/**
* 需走访人居住地址 列: visiter_address
@@ -148,7 +150,7 @@
/**
* 是否异常行为 列: exception
*/
- private Boolean exception;
+ private Integer exception;
/**
* 走访内容根据重点人员类型输入项不同，录入全部的表单内容数据 列: table_content_json
*/
@@ -171,4 +173,47 @@
*/
@TableField(fill = FieldFill.UPDATE)
private Date updateAt;
+
+ /**
+ * 地址备注
+ */
+ private String addressRemark;
+ /**
+ * 家庭联系电话
+ */
+ private String familyPhone;
+
+ /**
+ * 家庭来源
+ */
+ private String familySource;
+
+ /**
+ * 访问后的填写的地址
+ */
+ private String address;
+
+ /**
+ * 访问后的经纬度
+ */
+ private String latLng;
+
+ /**
+ * 本地或外地：1本地2外地
+ */
+ private Integer outOrLocal;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 网格ID
+ */
+ private Long gridId;
+ /**
+ * 是否已经上传浪潮服务器市平台
+ */
+ private Boolean lcUpload;
}
\ No newline at end of file
--
Gitblit v1.7.1