From e85d317a7ab0a4cc397f4b235b17f6223ec0840e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 28 三月 2025 08:41:49 +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/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