From 3d3620b81b9c2ae8e8f41ef542f0e5fa8ae43c00 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 06 三月 2025 10:53:27 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java index 4f92c34..fdab03e 100644 --- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java +++ b/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); /** -- Gitblit v1.9.3