From fd3e3b19aaf23c4f68d8b98d514499510b152e39 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 15:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/api/system/user.js |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 5b5bb50..431f6b0 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -135,6 +135,14 @@
   })
 }
 // 鏌ヨ鐢ㄦ埛鍒楄〃
+export function userListNoPageByTenantId() {
+  return request({
+    url: '/system/user/userListNoPageByTenantId',
+    method: 'get'
+  })
+}
+
+// 鏌ヨ鐢ㄦ埛鍒楄〃
 export function userListNoPage() {
   return request({
     url: '/system/user/userListNoPage',
@@ -142,9 +150,10 @@
   })
 }
 // 閮ㄩ棬鍒楄〃
-export function userDeptList(userId) {
+export function userLoginFacotryList(params) {
   return request({
-    url: '/userDeptList/' + userId,
+    url: '/userLoginFacotryList',
     method: 'get',
+    params: params
   })
 }

--
Gitblit v1.9.3