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

doum

2026-01-06 a291dd70f178d32f8b582a9c6ed1a73b5a81a62e

 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;