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

huminmin

6 天以前 7547cae4bed7d319f2cf1af4fa60c5d6c2c88f25

 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;

        }