Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-01 9e9bc96ae861e4d416a37ee412905f9f787083f0

 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);
   IPage<SysUser> getUserByWorkShopDepartId(Page page, @Param("baseFactoryId") String baseFactoryId, @Param("username") String username);

   /**
    * 根据用户名设置部门ID