Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test

张天森

2022-07-08 3983e5809d0ed2ce551a157a1b5b326b217c9b9c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java

@@ -396,8 +396,9 @@
                                              @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
                                              @RequestParam(value = "page",required = false) Integer page,
                                              @RequestParam(value = "belongTo",required = false) String  belongTo,
                                              @RequestParam(value = "size",required = false) Integer size){
        return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo);
                                              @RequestParam(value = "size",required = false) Integer size,
                                              @RequestParam(value = "unitId",required = false) Long unitId ){
        return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
    }

    /**