Merge remote-tracking branch 'origin/master'

jiangping

2024-05-08 cab86bd5a10b4e574ced9748a3718a5aa2d1b84b

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java

@@ -66,7 +66,7 @@
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:company:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        companyService.deleteById(id,this.getLoginUser());
        companyService.deleteById(id,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

@@ -79,7 +79,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        companyService.deleteByIdInBatch(idList,this.getLoginUser());
        companyService.deleteByIdInBatch(idList,this.getLoginUser(null));
        return ApiResponse.success(null);
    }