Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro

yuan

2026-05-14 51c5e8855a90afc8dbcb1a9571b7ab51334814b2

 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;

        }