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

@@ -1120,7 +1120,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         return """
                 select role_id  roleId ,any_value(role_name) roleNmae,game_id  gameId,any_value(game_name) gameName,ip,server_id serverId,any_value(server_name) serverName,user_id userId,any_value(user_name) userName from game_ads.role_ip_monitor
                 """ + criteria + """
-                    group by role_id,game_id,ip,server_id,user_id;
+                    group by role_id,game_id,ip,server_id,user_id
                 """;
     }
 

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

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (小游戏绑定手机号自动转端rpc接口新增 ･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (导量游戏用户增加单独字段表示 ･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -133,6 +133,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         h5User.setRelationUserId(user.getId());
         h5User.setRelationGameId(user.getGameId());
         h5User.setRelationCreateTime(LocalDateTime.now());
+        h5User.setImportUser(1);
         //充值统计数据归零设置
         h5User.setSessionKey(null);
         h5User.setRechargeCount(0);

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/User.java

@@ -211,6 +211,11 @@ public class User implements Serializable {
      */
     private String ipData;
 
+    /**
+     * 导量用户标识, 1 表示导量用户
+     */
+    private Integer importUser;
+
     /**
      * 获取用户显示手机号
      *