Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

yuan

10 天以前 d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff

 src/main/java/com/ruoyi/project/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;

        }