From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 114005c..6199a4d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -47,7 +47,6 @@
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
 import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
 import com.panzhihua.common.model.vos.user.UserPhoneVO;
-import com.panzhihua.common.utlis.ExcelSelectObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -2872,10 +2871,17 @@
      */
     @PostMapping("/elders/records/page")
     R pageQueryEldersAuthRecord(@RequestBody  PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
-	
+    /**
+     * description 批量保存重点人群人员信息
+     *
+     * @param list 重点人群信息
+     * @return R  保存结果
+     * @author manailin
+     * @date 2021/6/10 17:00
+     */
 	@PostMapping("/key_person/batch/save")
     R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);
-	
+
 	@GetMapping("/screen/population/statistic")
     R statistic(@RequestParam("communityId")Long communityId);
 
@@ -2893,7 +2899,7 @@
 
     @PostMapping("/elders/getAuthHistoryExport")
     R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
-	
+
 	@GetMapping("/screen/work/neighborCircle")
     R statisticNeighborCircle(@RequestParam("communityId") Long communityId);
 
@@ -2956,7 +2962,7 @@
      */
     @GetMapping("/screen/getScreenCivil")
     R getScreenCivil(@RequestParam("communityId")Long communityId);
-	
+
 	/**
      * 大屏统计邻里圈
      */
@@ -3003,7 +3009,7 @@
      */
     @GetMapping("/screen/work/workCount")
     R workCount(@RequestParam("communityId")Long communityId);
-	
+
 	/**
      * description 批量保存残疾人人员信息
      *

--
Gitblit v1.7.1