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

db/migrate/20190729080935_modify_login_for_users.rb

@@ -3,7 +3,7 @@ class ModifyLoginForUsers < ActiveRecord::Migration[5.2]
     users = User.where("created_on > '2019-07-26 19:00:00'")
     users.find_each do |use|
       use.update_attributes(login: use.login&.strip, phone: use.phone&.strip)
-      use.user_extension.update_column(:student_id, use.user_extension&.student_id&.strip)
+      use.user_extension.update_column(:student_id, use.user_extension&.student_id&.strip) if use.user_extension
     end
   end
 end