Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-30 9ac162353268b6dec8563d9a20ca881290ba1e63

 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);

}