Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 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;

}