From 2a0e9e6f92c5f25a53aefa4edb708f42472e8a6e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 16:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index fb949c1..9d2a774 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -22,13 +22,11 @@
 import com.doumee.dao.business.join.*;
 import com.doumee.dao.business.model.*;
 import com.doumee.dao.business.vo.RoomStatisticsVo;
+import com.doumee.dao.system.MultifileMapper;
 import com.doumee.dao.system.SystemUserMapper;
 import com.doumee.dao.system.dto.UserStatisticsDTO;
 import com.doumee.dao.system.join.NoticesJoinMapper;
-import com.doumee.dao.system.model.Notices;
-import com.doumee.dao.system.model.SystemDepartment;
-import com.doumee.dao.system.model.SystemDepartmentUser;
-import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.model.*;
 import com.doumee.dao.system.vo.UserStatisticsVo;
 import com.doumee.dao.web.request.BookingsRequest;
 import com.doumee.dao.web.request.MeetingPageRequest;
@@ -36,7 +34,6 @@
 import com.doumee.service.business.BookingsService;
 import com.doumee.service.business.DevicesService;
 import com.doumee.service.business.ProjectsService;
-import com.doumee.service.system.NoticesService;
 import com.doumee.service.system.SystemUserService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;

--
Gitblit v1.9.3