Merge branch 'huacheng_dev' into huacheng_shuangzheng

101captain

2022-06-29 17da4898e0519e6ea42344801d84574f60699503

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

@@ -5941,6 +5941,9 @@
    @PostMapping("/neighbor/update")
    R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);

    @PostMapping("/neighbor/serviceStatic")
    R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);

    /**
     * 获取系统配置value
     * @param key   系统配置code
@@ -9873,4 +9876,10 @@
     */
    @PostMapping("/comActAcidCheckRecord/update")
    R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);

    /**
     * 单位活动统计
     */
    @GetMapping("/neighbor/institutionalUnitServiceAnalysis")
    R institutionalUnitServiceAnalysis(@RequestParam(value = "year") Integer year,@RequestParam("communityId") Long communityId);
}