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

yuan

2026-07-15 7be2d271eafa48f7e7dcc8ac9d2219634b5938ef

 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;

        }