From 17f9f7d74b7f2f3344b335441f9bf1653cff03f0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 15:38:52 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
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