Merge remote-tracking branch 'origin/szzh' into szzh

app/models/at_message.rb

@@ -47,7 +47,7 @@ class AtMessage < ActiveRecord::Base
           "回复帖子: "
         end +  at_message.subject
       when 'JournalsForMessage'
-        "作业留言: " + at_message.jour.description
+        "作业: #{at_message.jour.name} 中留言"
       else
         logger.error "error type: #{at_message_type}"
     end