Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-07 1ccdcb4a890687d59b272f5397e8b41ae4ce2254

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -236,4 +236,6 @@

    List<SysUser> userByDeptList(List<Long> deptList);

    List<SysUser> userByDept(Long deptId);

}