Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

RuoYi

2020-08-07 a7eb07c7a0afb7da1eb9eb1bd902b0cec77921e2

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

@@ -75,7 +75,7 @@
    @Override

    public SysUserOnline loginUserToUserOnline(LoginUser user)

    {

        if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser()))

        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser()))

        {

            return null;

        }