"src/git@gitlab.ruzhoukj.com:wujipeng/pipeline-network.git" did not exist on "cfb7cf6e6e86d3d2ff9cf926dc89cbb86fe183ce"
Commit 799a5186 authored by zhuxiang's avatar zhuxiang
Browse files

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

parents 50016fb9 b85eeab0
...@@ -41,7 +41,7 @@ public class CaseController extends BaseController { ...@@ -41,7 +41,7 @@ public class CaseController extends BaseController {
@ApiOperation(value = "批量删除") @ApiOperation(value = "批量删除")
@DeleteMapping("/delete/batch") @DeleteMapping("/delete/batch")
public Result<Boolean> delete(@RequestParam List<String> ids) { public Result<Boolean> delete(@RequestParam(name = "ids") List<String> ids) {
return Result.data(caseService.removeBatchByIds(ids)); return Result.data(caseService.removeBatchByIds(ids));
} }
......
...@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -43,9 +44,9 @@ public class ExcelTemplateController extends BaseController { ...@@ -43,9 +44,9 @@ public class ExcelTemplateController extends BaseController {
return Result.data(excelTemplateService.saveOrUpdate(excelTemplateDTO)); return Result.data(excelTemplateService.saveOrUpdate(excelTemplateDTO));
} }
@ApiOperation(value = "删除") @ApiOperation(value = "批量删除")
@DeleteMapping("/{id}") @DeleteMapping("/delete")
public Result<Boolean> delete(@PathVariable Integer id) { public Result<Boolean> delete(@RequestParam(name = "ids") List<String> ids) {
return Result.data(excelTemplateService.removeById(id)); return Result.data(excelTemplateService.removeBatchByIds(ids));
} }
} }
...@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -47,10 +48,10 @@ public class WhiteController extends BaseController { ...@@ -47,10 +48,10 @@ public class WhiteController extends BaseController {
return Result.data(whiteService.saveWhite(whiteDTO)); return Result.data(whiteService.saveWhite(whiteDTO));
} }
@ApiOperation(value = "删除") @ApiOperation(value = "批量删除")
@DeleteMapping("/{id}") @DeleteMapping("/delete")
public Result<Boolean> delete(@PathVariable Integer id) { public Result<Boolean> delete(@RequestParam(name = "ids") List<String> ids) {
return Result.data(whiteService.removeById(id)); return Result.data(whiteService.removeBatchByIds(ids));
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment