Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-23 d568205ae121b69364720d3b13e19df69426909e

 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);
}