Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

3 天以前 353f44a6a33b1f557c1fb8e11eda4d425b8db668

 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;

        }