Merge branch 'feature-migration-20230628' of...

Merge branch 'feature-migration-20230628' of git.quantgroup.cn:head_group/xyqb-user2 into feature-migration-20230628

src/main/java/cn/quantgroup/xyqb/controller/api/v2/OauthApiV2Controller.java

@@ -26,6 +26,6 @@ public class OauthApiV2Controller {
      */
     @PostMapping("/login")
     public JsonResult<LoginBean> login(@RequestBody LoginReq loginReq){
-        return JsonResult.buildSuccessResultGeneric(loginContext.login(loginReq));
+        return JsonResult.buildSuccessResultGeneric(loginContext.interLogin(loginReq));
     }
 }

src/main/java/cn/quantgroup/xyqb/xxlJob/UserAttachedMigrationJobHandler.java

@@ -36,6 +36,8 @@ public class UserAttachedMigrationJobHandler {
                     userInfoEntity.setUserId(i.getUserId());
                     userInfoEntity.setTenantId(UserConstant.defaultTenantId);
                 }
+                userInfoEntity.setCreatedAt(i.getCreatedAt());
+                userInfoEntity.setUpdatedAt(i.getUpdatedAt());
 
                 userInfoEntity.setPhoto(i.getAvatar());
                 userInfoEntity.setNickName(i.getNick());