From 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:05:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

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

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java
index 0b4c8c5..e3e0b66 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java
@@ -1,12 +1,11 @@
 package com.doumee.service.business.impl;
 
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.RoomRecordMapper;
 import com.doumee.dao.business.join.RoomRecordJoinMapper;
 import com.doumee.dao.business.model.Bookings;
-import com.doumee.dao.business.model.Devices;
 import com.doumee.dao.business.model.RoomRecord;
 import com.doumee.dao.business.model.Rooms;
 import com.doumee.dao.system.model.SystemUser;

--
Gitblit v1.9.3