Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-07 7a9f9f26ed90c33190382645d0851490ce94424b

 server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java

@@ -40,7 +40,7 @@

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:devicerole:delete")
    //@RequiresPermissions("business:devicerole:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        deviceRoleService.deleteById(id);
        return ApiResponse.success(null);
@@ -48,7 +48,7 @@

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:devicerole:delete")
    //@RequiresPermissions("business:devicerole:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
@@ -84,7 +84,7 @@

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:devicerole:exportExcel")
    //@RequiresPermissions("business:devicerole:exportExcel")
    public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(DeviceRole.class).export(deviceRoleService.findPage(pageWrap).getRecords(), "门禁角色信息表", response);
    }