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

5 years ago · 5ff7e20f9d
parent 99d2c9478c f10400ceda
commit 5ff7e20f9d
1 changed files with 1 additions and 1 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -407,7 +407,7 @@ class User < ApplicationRecord

    name = lastname + firstname
    name.blank? ? (nickname.blank? ? login : nickname) : name
-    name.gsub(/\s+/, '').strip    #6.11 -hs
+    name.gsub(/\s+/, '').gsub(/\n/, '').strip    #6.11 -hs
  end

  # 用户是否选题毕设课题