From d568205ae121b69364720d3b13e19df69426909e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 23 四月 2021 16:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 5fe979a..0147ff0 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
@@ -22,7 +22,6 @@
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -1638,6 +1637,7 @@
     @PostMapping("/common/data/population/detail")
     R detailPopulation(@RequestParam(value = "populationId") Long populationId);
 
+
     /**
      * 根据id修改实有人口标签列表
      *
@@ -2147,4 +2147,12 @@
      */
     @PostMapping("/shop/wxPay")
     R wxPay(@RequestBody OrderPayDTO orderPayDTO);
+
+    /**
+     * 编辑实有人口
+     * @param editComMngPopulationVO
+     * @return
+     */
+    @PostMapping("/common/data/population/edit")
+    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);
 }

--
Gitblit v1.7.1