From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
index bf5bd82..8194c38 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
@@ -39,7 +39,7 @@
         if(eventType==null){
             return false;
         }
-        boolean inType = eventType==1 | eventType==2 |eventType==3| eventType==4| eventType==5;
+        boolean inType = eventType==1 | eventType==2 |eventType==3| eventType==4| eventType==5| eventType==6;
         return inType;
     }
 
@@ -57,6 +57,7 @@
         }
         LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
         pageEventDTO.setUserId(loginUserInfoVO.getUserId());
+        pageEventDTO.setRevokeType(1);
         return gridService.query(pageEventDTO);
     }
 

--
Gitblit v1.7.1