From 34c21f1c938ba3659c5d50201a0e64f747ee4545 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期六, 24 八月 2024 09:48:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java index 9e59184..2e29c49 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java @@ -24,7 +24,7 @@ * @param appletUserDecodeData * @return */ - Map<String, Object> wxLogin(AppletUserDecodeData appletUserDecodeData); + Map<String, Object> wxLogin(AppletUserDecodeData appletUserDecodeData,Long inviteUserId); /** * 支付宝小程序登录用户封装 @@ -32,7 +32,7 @@ * @return */ // Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response, AlipayUserInfoShareResponse userInfo); - Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response,String phone); + Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response,String phone,Long inviteUserId); /** * 封装用户信息和token -- Gitblit v1.7.1