Merge branch 'dev_aliyun' into educoder

app/models/message.rb

@@ -119,6 +119,10 @@ class Message < ActiveRecord::Base
     message_detail.try(:content)
   end
 
+  def content
+    message_detail.try(:content)
+  end
+
   # def content
   #   self.try(:content)
   # end