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/service/impl/SysUserServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 3540c10..f9c8e61 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -362,11 +362,11 @@
/**
* 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
* @param page
- * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+ * @param baseFactoryId 璁惧杞﹂棿绠＄悊Id
* @return
*/
- public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId,String username){
- return userMapper.getUserByWorkShopDepartId(page,workShopDepartId,username);
+ public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String baseFactoryId,String username){
+ return userMapper.getUserByWorkShopDepartId(page,baseFactoryId,username);
}
--
Gitblit v1.9.3