Merge remote-tracking branch 'origin/master'

jiangping

2024-10-08 f0a07ef5c374d8fe5519e8ad460ab3d1c85ca776

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java

@@ -112,7 +112,7 @@
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:bookings:query")
    public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(bookingsService.getMeetingDetail(id));
        return ApiResponse.success(bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
    }

    @ApiOperation("根据日期和会议室主键查询占用信息")