From f96b57cb69a5294bbebafa5b1da5e562e0954b66 Mon Sep 17 00:00:00 2001 From: dd <gitluke@outlook.com> Date: Wed, 20 May 2026 23:33:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10 --- src/main/java/com/nq/service/IAgentUserService.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/nq/service/IAgentUserService.java b/src/main/java/com/nq/service/IAgentUserService.java index 4a52e6c..b60398b 100644 --- a/src/main/java/com/nq/service/IAgentUserService.java +++ b/src/main/java/com/nq/service/IAgentUserService.java @@ -3,6 +3,7 @@ import com.github.pagehelper.PageInfo; import com.nq.common.ServerResponse; import com.nq.pojo.AgentUser; +import com.nq.pojo.GoogleAuthDto; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -12,7 +13,9 @@ AgentUser findByCode(String paramString); - ServerResponse login(String paramString1, String paramString2, String paramString3, HttpServletRequest paramHttpServletRequest); + ServerResponse login(String paramString1, String paramString2, String paramString3, Integer googleAuthCode, HttpServletRequest paramHttpServletRequest); + + GoogleAuthDto getGoogleAuth(HttpServletRequest request); ServerResponse getAgentInfo(HttpServletRequest paramHttpServletRequest); @@ -30,6 +33,8 @@ ServerResponse updateOnlineServices(String paramAgentUser,int agentId); + ServerResponse<List<AgentUser>> getParensAgent(); + int CountAgentNum(); List<AgentUser> getAgentSuperiorList(int agentId); -- Gitblit v1.9.3