From 1fbdd1f48a5ec551a4c044d4babd95633e36d62e Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期四, 03 六月 2021 21:44:21 +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 |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 53bc686..a653755 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
@@ -505,11 +505,11 @@
 
     /**
      * 网格数据待处理统计信息
-     * @param pageEventGridDataDTO
+     * @param eventGridStatisticsDataDTO
      * @return
      */
-    @PostMapping("/eventgriddata/getGridData")
-    R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+    @PostMapping("/eventgriddata/getGridStatisticsdData")
+    R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
 
     /**
      * 查询用户网格
@@ -659,4 +659,12 @@
      */
     @GetMapping("/eventapplicationapprelease/edition")
     R editionUpdate();
+
+    /**
+     * 首页待处理
+     * @param eventGridTodoDataDTO
+     * @return
+     */
+    @PostMapping("/eventgriddata/getGridTodoData")
+    R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO);
 }

--
Gitblit v1.7.1