From 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 05 七月 2021 13:15:58 +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 |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 472af43..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
@@ -201,5 +203,17 @@
      */
     private Integer outOrLocal;
 
+    /**
+     * 备注
+     */
+    private String remark;
 
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+    /**
+     * 是否已经上传浪潮服务器市平台
+     */
+    private Boolean lcUpload;
 }
\ No newline at end of file

--
Gitblit v1.7.1