From 230dba4f152e7d744b8e6c1124a94d21d2e59018 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 28 十月 2022 10:02:02 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
index e23728e..c11ccad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
@@ -109,7 +109,8 @@
     @GetMapping("/statistics/top")
     R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
                         @RequestParam(value = "belongTo") String belongTo,
-                        @RequestParam(value = "choice", required = false) String choice);
+                        @RequestParam(value = "choice", required = false) String choice,
+                        @RequestParam(value = "unitIds", required = false) Long[] unitIds);
 
     /**
      * 报到单位统计
@@ -131,7 +132,8 @@
     R pbStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
                       @RequestParam(value = "belongTo") String belongTo,
                       @RequestParam(value = "choice", required = false) String choice,
-                      @RequestParam(value = "checkUnitId", required = false) Long checkUnitId);
+                      @RequestParam(value = "checkUnitId", required = false) Long checkUnitId,
+                      @RequestParam(value = "unitIds", required = false) Long[] unitIds);
 
     /**
      * 报到党员统计-按单位归属统计

--
Gitblit v1.7.1