From 13ccebf29ce191cc97b1d584d4bf7aa6084ebce0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 23 六月 2021 14:39:50 +0800
Subject: [PATCH] 解决代码冲突

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
index bba87c9..d98dca1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
@@ -217,10 +217,12 @@
     @TableField(fill = FieldFill.UPDATE)
     private Date updateAt;
 
+    private Boolean upload;
+
     /**
      * 撤销人/社区ID   列: revoke_id
      */
-    private Long revokeID;
+    private Long revokeId;
     /**
      * 修改时间   列: revoke_type
      */

--
Gitblit v1.7.1