From 165f5d0ce0ee16bdce2b8af55ce4aa6383af6382 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 17:34:08 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 33e4346..b69a4e6 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
@@ -2,9 +2,9 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
 import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
 import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
@@ -23,17 +23,17 @@
 
     /**
      * 新增网格和网格员的关联关系
-     * @param eventGridMemberRelationAddDTO
+     * @param eventGridMemberAddDTO
      * @return 新增结果
      */
-    R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);
+    R add(EventGridMemberAddDTO eventGridMemberAddDTO);
 
     /**
      * 修改网格和网格员的关联关系
-     * @param eventGridMemberRelationEditDTO
+     * @param eventGridMemberEditDTO
      * @return 维护结果
      */
-    R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);
+    R edit(EventGridMemberEditDTO eventGridMemberEditDTO);
 
     /**
      * 分页查找网格和网格员的关联关系

--
Gitblit v1.7.1