Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-23 d568205ae121b69364720d3b13e19df69426909e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -3,7 +3,6 @@
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.*;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -298,6 +297,7 @@
        return comMngPopulationService.detailPopulation(populationId);
    }


    /**
     * 根据实有人口id修改标签列表
     * @param populationTagDTO 请求参数
@@ -340,4 +340,14 @@
    public R getPopulationLists(@RequestBody List<Long> Ids) {
        return comMngPopulationService.getPopulationLists(Ids);
    }

    /**
     * 编辑实有人口
     * @param editComMngPopulationVO
     * @return
     */
    @PostMapping("/population/edit")
    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){
        return comMngPopulationService.editPopulation(editComMngPopulationVO, communityId);
    }
}