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

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -979,16 +979,15 @@ public class RoleManageServiceImpl implements IRoleManageService {
         return """
                 select
                     role_id as roleId,
+                    role_name as roleName,
                     user_id as userId,
                     game_id as gameId,
-                    role_level as roleLevel,
+                    game_name as gameName,
                     server_id as serverId,
-                    role_name as roleName,
-                    role_vip as roleVip,
+                    server_name as serverName,
                     create_time as createTime,
+                    role_level as roleLevel,
                     level_time as levelTime,
-                    server_name as serverName,
-                    game_name as gameName
                     from ads_role_level_log
                 """ + criA;
     }