From 08eefab8f0b04018dc62928ec2191bcae9d3e7d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 15 十月 2021 16:25:01 +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 |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 dbb97f4..142f532 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
@@ -684,8 +684,8 @@
      * @return 删除结果
      */
     @PostMapping("/special/delete")
-    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
-        return comMngPopulationService.deleteSpecialInputUser(id);
+    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam(value = "communityId") Long communityId) {
+        return comMngPopulationService.deleteSpecialInputUser(id,communityId);
     }
 
     /**
@@ -768,6 +768,18 @@
     }
 
     /**
+     * 查询房屋二级级联菜单后台
+     *
+     * @param cascadeHouseDTO
+     *            请求参数
+     * @return 菜单列表
+     */
+    @PostMapping("/population/second/listBack")
+    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+        return comMngPopulationHouseService.getSecondHouse(cascadeHouseDTO);
+    }
+
+    /**
      * 分页查询房屋列表
      *
      * @param populationHouseAdminDTO

--
Gitblit v1.7.1