From cdc087c78307586f6f5957cfa199baabe332d0b3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 21 一月 2022 16:16:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index b963baa..882f2f6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -946,4 +946,17 @@
     public R detailHousesUser(@RequestParam("id") Long id) {
         return comMngPopulationHouseUserService.detail(id);
     }
+
+    /**
+     * 历史数据人员类型填充
+     * @param newVoList
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/history/filled")
+    public R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
+                                 @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
+        return comMngPopulationService.filledPopulationPersonType(newVoList, communityId, userId);
+    }
 }

--
Gitblit v1.7.1