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

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

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
index 1ea2fdb..754e8ed 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
@@ -69,7 +69,7 @@
 	 * @param workShopDepartId 璁惧杞﹂棿绠$悊Id
 	 * @return
 	 */
-	IPage<SysUser> getUserByWorkShopDepartId(Page page, @Param("workShopDepartId") String workShopDepartId, @Param("username") String username);
+	IPage<SysUser> getUserByWorkShopDepartId(Page page, @Param("baseFactoryId") String baseFactoryId, @Param("username") String username);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛鍚嶈缃儴闂↖D

--
Gitblit v1.9.3