From 4248fbfb4f6a43cbb4884523f599d7719d1ba1c6 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 09 五月 2025 13:56:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java index fb3d551..0ccae3e 100644 --- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java +++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java @@ -1,5 +1,6 @@ package com.doumee.dao.web.response; +import com.doumee.dao.business.model.Bookings; import com.doumee.dao.system.model.Multifile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,5 +36,7 @@ @ApiModelProperty(value = "浼氳鍒楄〃") private List<MeetingListResponse> meetingListResponseList; +// @ApiModelProperty(value = "浼氳鍒楄〃") +// private List<Bookings> meetingListResponseList; } -- Gitblit v1.9.3