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

app/models/journal.rb

@@ -533,6 +533,7 @@ class Journal < ApplicationRecord
   def operate_content 
     content = "#{operate_by_content}"
     detail = self.journal_details.take
+    content = ""
     case detail.property
     when 'issue'
       content += "创建了<b>疑修</b>"
@@ -606,7 +607,7 @@ class Journal < ApplicationRecord
         content += "由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
       end
     end
-
+    content = self.pm_operate_content if content == ""
   end
 
   def journal_content