From 18c0ffb02bbc0aa7eeea1d79a210260880b964f8 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 07 一月 2026 11:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserService.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserService.java
index d63428b..9981a93 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserService.java
@@ -13,10 +13,13 @@
 
     User getByUsername(String username, Long tenantId);
 
-    User getByIdRel(Long userId);
+    User getByEmail(String email, Long tenantId);
+
+    User setUserAuthInfo(User user);
 
     boolean comparePassword(String dbPassword, String inputPassword);
 
     String encodePassword(String password);
 
+    User selectByUsernameWithoutTenant(String username, Long tenantId);
 }

--
Gitblit v1.9.1