From 0baf54c6e64dc2c5c85059c577893866b6275e68 Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期一, 28 二月 2022 17:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |    7 +++++++
 1 files changed, 7 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 5880049..d2956e4 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
@@ -1363,6 +1363,13 @@
     R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);
 
     /**
+     * 西区大数据分析平台-综合治理栏
+     * @return
+     */
+    @GetMapping("/screen/comprehensive/governance")
+    R getComprehensiveGovernanceStatics();
+
+    /**
      * 大屏-新根据小区id查询小区统计人数
      *
      * @param villageId

--
Gitblit v1.7.1