Merge branch 'dev_aliyun' into develop

lib/tasks/tfxy.rake

@@ -18,7 +18,7 @@ namespace :tfxy do
     teach_data_last_row = teach_data.last_row
 
     2.upto(teach_data_last_row) do |r|
-      old_user = User.where("phone = '#{teach_data.cell(r, 5)}' OR mail = '#{teach_data.cell(r, 6)}' OR login = 'tfxy#{teach_data.cell(r, 1)}' " )
+      old_user = User.where("phone = '#{teach_data.cell(r, 5)}' OR mail = '#{teach_data.cell(r, 6)}' OR login = 'tfxy#{teach_data.cell(r, 1)}' " ).first
 
       if !old_user.present?
         user = User.new(