Merge branch 'huacheng' into huacheng_test

101captain

2022-07-06 d6578ec702eb4fcff690d71ea3237a885f46b85c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9898,14 +9898,5 @@
                                       @RequestParam(value = "page",required = false) Integer page,
                                       @RequestParam(value = "size",required = false) Integer size,
                                       @RequestParam(value = "belongTo",required = false) String  belongTo);
    /**
     * 单位活动统计
     */
    @GetMapping("/neighbor/activityAnalysisBackStage")
    R institutionalUnitServiceAnalysisBackStage(@RequestParam(value = "year",required = false) Integer year,
                                                @RequestParam(value = "type",required = false) Integer type,
                                                @RequestParam(value = "range",required = false)Integer range,
                                                @RequestParam(value = "communityId",required = false) Long communityId,
                                                @RequestParam(value = "page",required = false) Integer page,
                                                @RequestParam(value = "size",required = false) Integer size);

}