Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

lib/tasks/tfxy.rake

@@ -210,13 +210,12 @@ namespace :tfxy do
       else
         # 系统已有用户，关联sso认证用户
         old_user.update(
-           login: "tfxy#{student_data.cell(r, 1)}",
-            lastname: student_data.cell(r, 2),
-            nickname: student_data.cell(r, 2),
-            certification: true,
-            professional_certification: true,
-            authentication: true,
-            profile_completed: true)
+          lastname: student_data.cell(r, 2),
+          nickname: student_data.cell(r, 2),
+          certification: true,
+          professional_certification: true,
+          authentication: true,
+          profile_completed: true)
 
         OpenUsers::Cas.find_or_create_by(uid: student_data.cell(r, 1)) do |u|
           u.extra = {phone: student_data.cell(r, 8)}