Merge remote-tracking branch 'origin/master'

jiangping

2024-09-20 af1603e4e4f5505a1fd5526134bbd43dc66d5281

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

@@ -75,14 +75,14 @@



    @ApiOperation("会议详情")
    @GetMapping("/meetingDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
        return ApiResponse.success("查询成功", bookingsService.getMeetingDetail(id));
    }
//    @ApiOperation("会议详情")
//    @GetMapping("/meetingDetail")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
//    })
//    public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
//        return ApiResponse.success("查询成功", bookingsService.getMeetingDetail(id));
//    }

    @ApiOperation("获取会议开门二维码")
    @GetMapping("/getQrCode")