Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-01 5aae43c2d47e8c7c5ea6457fbb2db99fa9357642

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -365,8 +365,8 @@
    * @param workShopDepartId 设备车间管理Id
    * @return
    */
   public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId){
      return userMapper.getUserByWorkShopDepartId(page,workShopDepartId);
   public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId,String username){
      return userMapper.getUserByWorkShopDepartId(page,workShopDepartId,username);
   }