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

云

2026-09-03 3c89b91df438a2364ee30f6231a76daaecf978ff

 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;

        }