Merge remote-tracking branch 'origin/package' into package

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服务启动成功 <解决bug调试修改2> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <解决bug调试修改3> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -151,7 +151,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 .roleVipLevel(gameUserRole.getRoleVipLevel())
                 .rolePower(gameUserRole.getRolePower())
                 .os(gameUserRole.getOs())
-                .regTime(gameUserRole.getCreateTime())
+                .regTime(gameUserRole.getRegTime())
                 .createTime(gameUserRole.getCreateTime())
                 .updateTime(gameUserRole.getUpdateTime())
                 .lastLoginTime(gameUserRole.getLastLoginTime())