Merge remote-tracking branch 'origin/master'

Administrator

2023-08-10 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed

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

@@ -26,7 +26,6 @@
     * @return 用户信息集合信息
     */
    public List<SysUser> selectAllAppUserList(SysUser user);

    /**
     * 根据条件分页查询已分配用户角色列表
     *
@@ -235,4 +234,6 @@
     */
    public void clearUserCache(String[] userIds);

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

}