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

5 years ago · 23e892a796
parent a08e9437b0 dd02cae280
commit 23e892a796
1 changed files with 6 additions and 7 deletions
--- a/lib/tasks/tfxy.rake
+++ b/lib/tasks/tfxy.rake
@ -210,7 +210,6 @@ 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,