From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
index 805c00e..a313542 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.account.api.model.AppUser;
 import com.ruoyi.account.vo.*;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,7 +24,7 @@
 	 * @param appletLogin
 	 * @return
 	 */
-	AjaxResult appletLogin(AppletLogin appletLogin);
+	R appletLogin(AppletLogin appletLogin);
 	
 	
 	/**
@@ -30,7 +32,7 @@
 	 * @param mobileLogin
 	 * @return
 	 */
-	AjaxResult<LoginVo> mobileLogin(MobileLogin mobileLogin);
+	R<LoginVo> mobileLogin(MobileLogin mobileLogin);
 	
 	
 	/**
@@ -38,7 +40,7 @@
 	 * @param smsCode
 	 * @return
 	 */
-	AjaxResult getSMSCode(SMSCode smsCode);
+	R getSMSCode(SMSCode smsCode);
 	
 	
 	/**
@@ -46,5 +48,18 @@
 	 * @param registerAccount
 	 * @return
 	 */
-	AjaxResult<LoginVo> registerAccount(RegisterAccount registerAccount);
+	R<LoginVo> registerAccount(RegisterAccount registerAccount);
+	
+	
+	/**
+	 * 获取附近的推广人
+	 * @param nearbyReferrer
+	 * @return
+	 */
+	List<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer);
+
+	/**
+	 * 获取用户的祖籍列表
+	 */
+	List<AppUser> getUserAncestorList(Long id,List<AppUser> list);
 }

--
Gitblit v1.7.1