From 7eedb5a250515610f1df1fa0730cf779f0525add Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 08 七月 2021 08:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
index e73810c..72dad4c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
@@ -7,6 +7,7 @@
 import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventGridDataVO;
 import com.panzhihua.service_grid.service.EventGridDataService;
+import com.panzhihua.service_grid.service.LcCompareCodeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +28,8 @@
 
     @Resource
     private EventGridDataService eventGridDataService;
+    @Resource
+    private LcCompareCodeService lcCompareCodeService;
 
 
     /**
@@ -166,4 +169,15 @@
     public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
         return eventGridDataService.deleteGridDataByAdmin(Ids);
     }
+
+    /**
+     * 综治后台-查询所有市平台网格列表
+     * @return  市平台网格列表
+     */
+    @GetMapping("/lc/list")
+    public R getLcGridLists(){
+        return lcCompareCodeService.getLcGridLists();
+    }
+
+
 }

--
Gitblit v1.7.1