Merge remote-tracking branch 'origin/master'

yn147

2022-11-24 138ccc9fe4798e5335c49a6407e8cdc70e1ff122

 src/main/java/com/qxueyou/scc/user/service/impl/UserService.java

@@ -67,9 +67,12 @@
        wrapper.setOrg(org);
        wrapper.setClass(objClsClass);
        wrapper.setLoginInfo(param.getCacheIpFlag(), param.getIp(), param.getPlatForm());
        System.out.println("aaa"+user.getUserId());
        session.setAttribute(UserInfoWrapper.INF_USER_ID,user.getUserId());
        session.setAttribute(UserInfoWrapper.INF_USER_NAME,user.getName());
        if(objClsClass!=null){
            session.setAttribute(UserInfoWrapper.INF_CLASS_ID,objClsClass.getClassId());
            session.setAttribute(UserInfoWrapper.INF_CLASS_NAME,objClsClass.getName());
        }
        return wrapper;
    }