From 593d785f10bc554cdc8eddf23e5e324c0258adbb Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 01 七月 2025 17:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 4ff2058..cf414ed 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -167,10 +167,10 @@
 	/**
 	 * 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
 	 * @param page
-	 * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+	 * @param baseFactoryId 璁惧杞﹂棿绠＄悊Id
 	 * @return
 	 */
-	public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId);
+	public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String baseFactoryId,String username);
 
 
 	/**

--
Gitblit v1.9.3