From b011bd6481707b75ae1aecddba029115fa9a6a43 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 02 七月 2021 17:56:20 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index bda05bc..1dfa380 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -3,6 +3,7 @@
 import com.panzhihua.common.model.dtos.IdDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
 import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
 import com.panzhihua.common.model.query.visit.EventTasksQuery;
 import com.panzhihua.common.model.query.visit.EventVisitListQuery;
 import com.panzhihua.common.model.vos.R;
@@ -1201,4 +1202,19 @@
      */
     @PostMapping("/eventvisitingtasks/complete")
     R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO);
+
+    /**
+     * 查询市平台网格员列表
+     * @return  市平台网格员列表
+     */
+    @GetMapping("/eventgridmemberrelation/lc/list")
+    R gridMemberLcList();
+
+    /**
+     * 综治后台-添加网格员级联列表
+     * @param memberCascadeAddDTO   请求参数
+     * @return  级联列表
+     */
+    @PostMapping("/eventgridmemberrelation/cascade/list")
+    R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);
 }

--
Gitblit v1.7.1