From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001 From: tangxiaobao <303826152@qq.com> Date: 星期三, 18 八月 2021 18:53:24 +0800 Subject: [PATCH] Merge branch 'txb' --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 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 2e9b6c1..5a1468f 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,6 +1,8 @@ package com.panzhihua.service_grid.model.dos; 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; @@ -18,6 +20,7 @@ * */ @Data @TableName("event_visiting_tasks") +//@EncryptDecryptClass public class EventVisitingTasksDO implements Serializable { private static final long serialVersionUID = 1L; @@ -62,6 +65,7 @@ /** * 需走访人电话 列: visiter_tele */ +// @EncryptDecryptField private String visiterTele; /** * 需走访人居住地址 列: visiter_address @@ -200,13 +204,16 @@ private Integer outOrLocal; /** - * 上报浪潮 - */ - private String lcUpload; - - /** * 备注 */ private String remark; + /** + * 网格ID + */ + private Long gridId; + /** + * 是否已经上传浪潮服务器市平台 + */ + private Boolean lcUpload; } \ No newline at end of file -- Gitblit v1.7.1