| 
					
				 | 
			
			
				@@ -271,6 +271,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(GameServer::getGameId, gameId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(isMerge != null, GameServer::getIsMerge, isMerge) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .orderByAsc(GameServer::getStartTime) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .orderByAsc(GameServer::getCreateTime) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ).stream().map(gameServer -> BeanUtil.copy(gameServer, GameServerVO.class)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .collect(Collectors.toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |