From 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 17:14:19 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
index 4204f79..b304ab4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
@@ -72,4 +72,16 @@
     @ApiOperation(value = "自动上传重点人员和流动人员走访记录")
     @GetMapping("lc/auto/upload/visit_record")
     void automationUploadVisitRecord();
+
+    @ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
+    @GetMapping("lc/event/getGridMemberListByAreaIdOrName")
+    R getGridMemberListByAreaIdOrName(@RequestParam("areaId") String areaId,@RequestParam("param") String param,@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);
+
+    @ApiOperation(value = "获取指定区域网格树形列表,不包括具体的网格数据")
+    @GetMapping("lc/grid/tree")
+    R getGridTreeByAreaId(@RequestParam("areaId") String areaId);
+
+    @ApiOperation(value = "获取指定区域网格列表")
+    @GetMapping("lc/grid/list")
+    R getGridDataListByAreaId(@RequestParam("areaId") String areaId);
 }

--
Gitblit v1.7.1