Merge branch '2.1' into 2.3

longz

2026-07-14 b50e57bf7e17d696ddb4e9785c909052da034ef4

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java

@@ -32,7 +32,7 @@
     * @return
     */
//    Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response, AlipayUserInfoShareResponse userInfo);
    Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response,String phone,Long inviteUserId);
    Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response,String phone,Long inviteUserId,String aliUserId,String aliUnionId);

    /**
     * 封装用户信息和token