Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-11 9df95cfc0f6109d0cc04657d26a2c9af033950d9

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

}