Merge remote-tracking branch 'origin/master'

jiangping

2024-05-15 ccf69ee82f77a2e67a565cec02f95e64324a283f

 server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java

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

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