From 5aae43c2d47e8c7c5ea6457fbb2db99fa9357642 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 01 七月 2025 12:27:10 +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 |    2 +-
 1 files changed, 1 insertions(+), 1 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..054f458 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
@@ -170,7 +170,7 @@
 	 * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
 	 * @return
 	 */
-	public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId);
+	public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId,String username);
 
 
 	/**

--
Gitblit v1.9.3