From 6905023c1ce3239f5b2569caac6d151e9788841c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 29 六月 2022 10:25:03 +0800
Subject: [PATCH] Merge branch 'huacheng_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
index 681474c..2831e44 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -395,5 +395,4 @@
     public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "communityId",required = false) Long communityId){
         return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,communityId);
     }
-
 }

--
Gitblit v1.7.1