From 62c0d18b76729935c6a1b30efa83452a32d02c83 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 20:03:57 +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 d9b757d..3848f97 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
@@ -879,6 +879,14 @@
     R gridReportPosition(@RequestBody GridMemberPositionDTO memberPositionDTO);
 
     /**
+     * 直接上报社区
+     * @param commonEventDirectReportDTO
+     * @return
+     */
+    @PostMapping("/event/reportDirect")
+    R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO);
+
+    /**
      * 定时任务扫描网格员工作状态
      * @return  定时任务扫描结果
      */

--
Gitblit v1.7.1