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

app/controllers/managements_controller.rb

@@ -3034,7 +3034,7 @@ end
                 department = school.departments.where(:name => list[2]).first
                 user_params = {status: 1, login: prefix + list[0].to_s.strip, lastname: list[1].to_s.strip,
                                nickname: list[1].to_s.strip, professional_certification: 1, certification: 1, grade: 0,
-                               password: "12345678", phone: list[5].blank? ? nil : list[5], mail: nil}
+                               password: "12345678", phone: list[5].blank? ? nil : list[5], mail: "#{prefix+list[0].to_s.strip}@qq.com", profile_completed: 1}
                 user = User.create(user_params)
                 user = User.find(prefix + list[0].to_s.strip)
                 if user

app/models/user.rb

@@ -673,9 +673,9 @@ class User < Principal
     base_reload(*args)
   end
 
-  def mail=(arg)
-    write_attribute(:mail, arg.to_s.strip)
-  end
+  # def mail=(arg)
+  #   write_attribute(:mail, arg.to_s.strip)
+  # end
 
   def identity_url=(url)
     if url.blank?