Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -84,12 +84,11 @@
     * 查询便民服务商家详情
     *
     * @param id 商家主键
     * @param cityCode 城市编码
     * @return 返回结果
     */
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode) {
        return comCvtBusinessService.getComCvtBusiness(id, cityCode);
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return comCvtBusinessService.getComCvtBusiness(id);
    }

    /**
@@ -238,7 +237,7 @@
     * @param list 服务集合
     */
    @PostMapping("/serve/import")
    public R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,@RequestParam("communityId") Long communityId){
    public R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,@RequestParam(value = "communityId",required = false) Long communityId){
        return comCvtServeService.listSaveConvenientServeExcelVO(list,communityId);
    }
}