Merge commit 'e0296ea7' into dev_pro_河南鹤壁_首检

gongchunyi

2 天以前 2a8a4cf20e55bbef3a9f8959136ee828b058dac0

 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;

        }