From 8ee3531169978ab1acf0b8bfb12ec22b3d828a56 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 09:13:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventTransferRecordDO.java |    8 ++++----
 1 files changed, 4 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..2eebc64 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
      */

--
Gitblit v1.7.1