Merge remote-tracking branch 'origin/wn' into ywx

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

             Integer usertype = userVo.getUsertype();
             userLog.setUsertype(usertype);
             String ultype = user.getUltype();
-            if (N_Utils.isNotEmpty(ultype) && ultype.equals("p_web") && usertype != null) {
+            if (N_Utils.isNotEmpty(ultype) && (ultype.equals("p_web") || ultype.equals("live_pc")) && usertype != null) {
                 //网页端学生和教师合并登录，前端传p_web,拼接完整的ultype
                 if (usertype == 2) {
                     userLog.setUltype(user.getUltype() + "_s");