From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +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/EventTransferRecordDO.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventTransferRecordDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventTransferRecordDO.java
index bd9f85b..f1e677b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventTransferRecordDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventTransferRecordDO.java
@@ -38,9 +38,9 @@
      */
     private Integer fromType;
     /**
-     * 事件来源机构或网格员   列: from
+     * 事件来源机构或网格员   列: from_id
      */
-    private Long from;
+    private Long fromId;
     /**
      * 转交办理人路径名称   列: from_name
      */
@@ -50,9 +50,9 @@
      */
     private Integer toType;
     /**
-     * 事件下游机构或网格员   列: to
+     * 事件下游机构或网格员   列: to_id
      */
-    private Long to;
+    private Long toId;
     /**
      * 需要办理人路径名称   列: to_name
      */
@@ -66,6 +66,18 @@
      */
     private Date processDate;
     /**
+     * 处理人或社区   列: process_by
+     */
+    private Long processBy;
+    /**
+     * 处理人名或社区名   列: process_by_name
+     */
+    private String processByName;
+    /**
+     * 业务处理类型   列: process_type
+     */
+    private Integer processType;
+    /**
      * 创建时间   列: create_at
      */
     @TableField(fill = FieldFill.INSERT)

--
Gitblit v1.7.1