Merge branch 'reservation_2022_5_31' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ImLiveBroadcastRoomDao.java

@@ -37,7 +37,7 @@ public interface ImLiveBroadcastRoomDao extends BaseMapper<ImLiveBroadcastRoom>
      *
      * @return
      */
-    PageInfo<RoomReservationUserVo> queryRoomUser(@Param("page") IPage<RoomReservationUserVo> page,
+    IPage<RoomReservationUserVo> queryRoomUser(@Param("page") IPage<RoomReservationUserVo> page,
                                                   @Param("query") RoomReservationUserSearch query);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -1175,7 +1175,8 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
 
 
         IPage<RoomReservationUserVo> page = new Page<>(query.getPage(),query.getRows());
-        return  baseMapper.queryRoomUser(page,query);
+        page = baseMapper.queryRoomUser(page, query);
+        return PageUtil.pageInfo(page);
     }
 
     /**