Merge branch 'standalone_develop' into pre_trustie_server

This commit is contained in:
xiaoxiaoqiong 2022-04-06 20:32:31 +08:00
commit f082819496
1 changed files with 11 additions and 9 deletions

View File

@ -3,6 +3,8 @@ json.array! users do |user|
json.username user.full_name json.username user.full_name
json.login user.login json.login user.login
json.user_id user.id json.user_id user.id
json.mail user.mail
json.custom_department user.custom_department
json.image_url url_to_avatar(user) json.image_url url_to_avatar(user)
json.profile_completed user.profile_completed json.profile_completed user.profile_completed
end end