Merge branch 'standalone_develop' into pre_trustie_server
This commit is contained in:
commit
f082819496
|
@ -1,9 +1,11 @@
|
||||||
# 单表存储的信息可以放里面
|
# 单表存储的信息可以放里面
|
||||||
json.array! users do |user|
|
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.image_url url_to_avatar(user)
|
json.mail user.mail
|
||||||
json.profile_completed user.profile_completed
|
json.custom_department user.custom_department
|
||||||
end
|
json.image_url url_to_avatar(user)
|
||||||
|
json.profile_completed user.profile_completed
|
||||||
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue