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

5 years ago · affb48b585
parent b3db447044 c145345c4d
commit affb48b585
1 changed files with 1 additions and 1 deletions
--- a/app/views/shixuns/add_collaborators.json.jbuilder
+++ b/app/views/shixuns/add_collaborators.json.jbuilder
@ -3,6 +3,6 @@ json.user_count @users_count
 json.array! @users do |user|
  json.user_id user.id
  json.identify user.identity
-  json.nickname user.real_name
+  json.nickname user.lastname
  json.school_name user.school_name
 end