Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-02-27 98250a7cff913563152ae8b313c7f45cc27545ba

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java

@@ -1,9 +1,9 @@
package com.doumee.service.business;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.model.Bookings;
@@ -18,10 +18,8 @@
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
import com.doumee.dao.web.response.RoomDetailResponse;
import org.apache.ibatis.annotations.Param;

import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;

/**
@@ -127,7 +125,7 @@
     * @param dateMsg
     * @return
     */
    List<Bookings> getMyBookings(Integer userId,String dateMsg);
    List<Bookings> getMyBookings(Integer userId,String dateMsg,Integer queryType);


    /**