Merge remote-tracking branch 'origin/master'

huanghongfa

2021-07-30 b200b681bc401bb11c133a79273ba78cb6ebedf8

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java

@@ -71,6 +71,8 @@

    R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO);

    R getMapGridsListsByApp(Long userId);