Merge remote-tracking branch 'origin/test_esay_photo' into test_esay_photo

huanghongfa

2021-06-24 eb0e0847f4030ec96d18ab0e632aa1668ff6126d

 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);
    }