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

k94314517

2023-09-14 a7e6a3b52c64ba9add0ceb643d6915473a7770a4

 server/platform/src/main/java/com/doumee/api/business/BaseDataController.java

@@ -41,7 +41,7 @@
    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:basedata:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
    public ApiResponse deleteById(@PathVariable String id) {
        baseDataService.deleteById(id);
        return ApiResponse.success(null);
    }
@@ -51,9 +51,9 @@
    @RequiresPermissions("business:basedata:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        List<String> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
            idList.add(id);
        }
        baseDataService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);