Merge branch 'develop' into dev_aliyun

dev_cs_new
daiao 6 years ago
commit 085c177e85

@ -1,5 +1,6 @@
json.memo do
json.id memo.id
json.forum_id memo.forum_id
json.subject memo.subject
json.is_md memo.is_md
json.content memo.content

@ -16,7 +16,7 @@ json.college_identifier @user.college_identifier
json.followed User.current.watched?(@user)
if @user.logged_user?
json.can_apply_trial @user.can_apply_trial?
#json.can_apply_trial @user.can_apply_trial?
json.attendance_signed @user.attendance_signed?
json.tomorrow_attendance_gold @user.tomorrow_attendance_gold
end

Loading…
Cancel
Save