From 3983e5809d0ed2ce551a157a1b5b326b217c9b9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 16:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index e47bd7e..e132050 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -377,8 +377,9 @@
                                   @RequestParam(value = "communityId",required = false) Long communityId,
                                   @RequestParam(value = "page",required = false) Integer page,
                                   @RequestParam(value = "size",required = false) Integer size,
-                                  @RequestParam(value = "belongTo",required = false) String belongTo){
-        return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo);
+                                  @RequestParam(value = "belongTo",required = false) String belongTo,
+                                  @RequestParam(value = "unitId",required = false) Long unitId){
+        return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
     }
 
 

--
Gitblit v1.7.1