Merge branch 'huacheng' into huacheng_test

101captain

2022-06-30 cc595b0aa24773735417accd0158da6ac98a6db0

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

@@ -387,6 +387,14 @@
        return this.comActNeighborCircleService.orderAndSolve(editNeighborCircleAdminVO);
    }

    /**
     * 机关单位服务统计排行
     * @return
     * */
    @GetMapping("institutionalUnitServiceAnalysis")
    public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "communityId",required = false) Long communityId){
        return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,communityId);
    }
    @PostMapping("/serviceStatic")
    public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){
        return this.comActNeighborCircleService.serviceStatic(serviceStaticDTO);