From 098b507166a2b23f0256d5c4f097e7f05f11e9be Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 09:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
index f4b8455..619206a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
@@ -77,9 +77,18 @@
      * @author manailin
      * @date 2021/6/10 17:00
      */
-    List<LcGridData> getGridListByAreaId(String areaId);
+    List<LcGridData> getGridTreeByAreaId(String areaId);
 
     /**
+     * description 获取指定区域网格列表,直接返回网格列表
+     *
+     * @param areaId 区域ID
+     * @return String 事件信息
+     * @author manailin
+     * @date 2021/6/10 17:00
+     */
+    List<LcGridData> getGridDataListByAreaId(String areaId);
+    /**
      * description 获取所有或者根据姓名和工号查询,分页
      *
      * @param areaId 区域ID

--
Gitblit v1.7.1