新增: 接口文档更新

app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder

@@ -18,8 +18,8 @@ json.issue do
   end
   json.priority issue&.priority.try(:name)
   json.version issue&.version.try(:name)
-  json.comments_count issue.journals.count 
+  json.journals_count issue.journals.count 
   json.issue_tags issue.get_issue_tags
 end
 
-json.comments_count pull.journals.count
+json.journals_count pull.journals.count

app/views/api/v1/projects/pulls/show.json.jbuilder

@@ -26,4 +26,5 @@ json.last_review do
   else 
     json.nil! 
   end
-end
+end
+json.conflict_files @pull_request.conflict_files