Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2026-04-22 75b27888383db6ce995782582c522c1a2df6ca8c

 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;

        }