From 89b19f453e03402aa2c8a588e5be1f491c007141 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 11 三月 2025 13:49:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into front

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

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/UserMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/UserMapper.java
index 270eedf..e92e0c4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/UserMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/UserMapper.java
@@ -18,6 +18,9 @@
     List<User> selectPageRel(@Param("page") IPage<User> page, @Param("param") Map<String, Object> param);
 
     @InterceptorIgnore(tenantLine = "true")
-    User selectByUsername(@Param("username") String username, @Param("tenantId") Long tenantId);
+    User selectByUsernameWithoutTenant(@Param("username") String username, @Param("tenantId") Long tenantId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    User selectByEmailWithoutTenant(@Param("email") String email, @Param("tenantId") Long tenantId);
 
 }

--
Gitblit v1.9.1