Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <原始区服名称1> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <bug调试修改> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameServerServiceImpl.java

@@ -124,7 +124,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
             gameId = gameDTO.getSuperGameId();
         }
         return page(param.toPage(), new QueryWrapper<GameServer>().lambda()
-                .eq(gameId != null, GameServer::getGameId, param.getGameId())
+                .eq(gameId != null, GameServer::getGameId, gameId)
                 .eq(param.getServerId() != null, GameServer::getServerId, param.getServerId())
                 .like(Strings.isNotBlank(param.getServerName()), GameServer::getServerName, param.getServerName())
                 .like(Strings.isNotBlank(param.getNickName()), GameServer::getNickName, param.getNickName())