From 7261a405f2523371fcf2269f79a5380b40840f6c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 31 五月 2021 13:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |    8 ++++++++
 1 files changed, 8 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 7511707..f36b1c6 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
@@ -2,6 +2,7 @@
 
 import com.panzhihua.common.model.dtos.grid.*;
 import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.community.ComActVO;
 import com.panzhihua.common.model.vos.grid.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -637,6 +638,13 @@
     R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
 
     /**
+     * 分页查询社区列表
+     * @return  结果
+     */
+    @PostMapping("/event/actList")
+    R actList();
+
+    /**
      * 地图模块-根据网格id查询网格详细信息
      * @param gridId    网格id
      * @return  网格详细信息

--
Gitblit v1.7.1