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

xyh

2021-06-30 c195b4ebc79b60539083f7089a5f878c1604fce9

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java

@@ -48,6 +48,7 @@
        ClazzUtils.setIfStringIsEmpty(pagePublicityEventDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pagePublicityEventDTO.setUserId(loginUserInfoVO.getUserId());
        pagePublicityEventDTO.setRevokeType(1);
        return gridService.queryPublicity(pagePublicityEventDTO);
    }
    /**