Merge remote-tracking branch 'origin/master'

zhs

昨天 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -78,6 +78,12 @@
    @DataScope(deptAlias = "d", userAlias = "u")
    public List<SysUser> selectUserList(SysUser user) {
        return userMapper.selectUserList(user);

    }

    @Override
    public List<SysUser> getUserList(SysUser user) {
        return userMapper.getUserList(user);
    }

    /**