Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

dev_cs_new
杨树明 6 years ago
commit 2afb00f46e

@ -3,6 +3,7 @@ json.message 'success'
json.private_message do json.private_message do
json.extract! @message, :id, :user_id, :receiver_id, :sender_id, :content json.extract! @message, :id, :user_id, :receiver_id, :sender_id, :content
json.send_day @message.send_time.strftime('%Y-%m-%d')
json.send_time @message.display_send_time json.send_time @message.display_send_time
json.sender do json.sender do
json.partial! 'users/user_simple', user: @message.sender json.partial! 'users/user_simple', user: @message.sender

Loading…
Cancel
Save