Merge branch 'dev_daiao' into dev_aliyun

6 years ago · a2509a4dfa
parent e31f73ace1 da61ead624
commit a2509a4dfa
1 changed files with 1 additions and 0 deletions
--- a/app/views/subjects/down_member_position.json.jbuilder
+++ b/app/views/subjects/down_member_position.json.jbuilder
@ -1,3 +1,4 @@
 json.members @subject.subject_members do |member|
  json.partial! 'subject_member', locals: { user: member.user }
+  json.role member.role
 end