From 2eea3290641657d2ee13edd90d27f8b2ec01c209 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期六, 08 五月 2021 18:23:48 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |   20 ++++++++++++++++++++
 1 files changed, 20 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 170a2c9..e134633 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
@@ -298,6 +298,16 @@
         return comMngPopulationService.detailPopulation(populationId);
     }
 
+    /**
+     * 查询实有人口电子档信息
+     * @param populationId  实有人口id
+     * @return  实有人口电子档信息
+     */
+    @PostMapping("/population/electronicArchives")
+    public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) {
+        return comMngPopulationService.electronicArchivesPopulation(populationId);
+    }
+
 
     /**
      * 根据实有人口id修改标签列表
@@ -361,4 +371,14 @@
     public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
         return comMngPopulationService.specialInputUser(pageInputUserDTO);
     }
+
+    /**
+     * 删除特殊群体人员
+     * @param id    特殊群体id
+     * @return  删除结果
+     */
+    @PostMapping("/special/delete")
+    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id){
+        return comMngPopulationService.deleteSpecialInputUser(id);
+    }
 }

--
Gitblit v1.7.1