From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
index 33703ac..b6dd60f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
@@ -16,11 +16,12 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 public interface EventGridMemberRelationService extends IService<EventGridMemberRelationDO> {
 
     /**
      * 新增网格和网格员的关联关系
+     * 
      * @param eventGridMemberAddDTO
      * @return 新增结果
      */
@@ -28,6 +29,7 @@
 
     /**
      * 修改网格和网格员的关联关系
+     * 
      * @param eventGridMemberEditDTO
      * @return 维护结果
      */
@@ -35,6 +37,7 @@
 
     /**
      * 分页查找网格和网格员的关联关系
+     * 
      * @param pageEventGridMemberRelationDTO
      * @return 维护结果
      */
@@ -42,6 +45,7 @@
 
     /**
      * 删除网格和网格员的关联关系
+     * 
      * @param EventGridMemberRelationDeleteDTO
      * @return 平台用户信息
      */
@@ -49,21 +53,26 @@
 
     /**
      * 查询网格和网格员的关联关系详细信息
-     * @param id 网格和网格员的关联关系 id
+     * 
+     * @param id
+     *            网格和网格员的关联关系 id
      * @return 查找结果
      */
     R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(Long id);
 
     /**
      * 根据网格员id查询关联网格列表
-     * @param userId    网格员id
-     * @return  网格列表
+     * 
+     * @param userId
+     *            网格员id
+     * @return 网格列表
      */
     R getMapGridListByApp(Long userId);
 
     /**
      * 查询市平台网格员列表
-     * @return  市平台网格员列表
+     * 
+     * @return 市平台网格员列表
      */
     R lcList();
 
@@ -72,8 +81,5 @@
     R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO);
 
     R getMapGridsListsByApp(Long userId);
-
-
-
 
 }

--
Gitblit v1.7.1