Merge branch 'dev_third_stage'

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-web/src/common/lang/zh-cn.js

@@ -785,6 +785,7 @@ module.exports = {
   SynchronousReportLibrary: '同步上报库',
   FreezeConfiguration: '冻结配置',
   distributionAndCollection: '下发收集',
+  OneclickCollection: '一键下发收集',
   deleteConfiguration: '删除配置',
   addConfiguration: '添加配置',
   electricMachinery: '电机',
@@ -1156,4 +1157,16 @@ module.exports = {
   TechnicalEvaluationResultsForReference:'技术评估结果参考',
   ComplianceConfirmationRecord:'符合性确认记录',
   complianceConfirmation:'符合性确认',
+  Deriveconformanceresults:'导出符合性结果',
+  Regulatorycompliancekanban:'法规符合性看板',
+  noComparisonDocumentSelected:'未选择对比文档',
+  RemarkInfo:'备注信息',
+  initiateDocumentComparison:'发起文档对比',
+  comparativeComments:'对比评论',
+  viewTheComparisonResults:'查看对比结果',
+  addFullTextComment:'添加全文评论',
+  turnOffAutomaticMatching:'关闭自动匹配',
+  exportComparisonReport:'导出对比报告',
+  comparisonDifferenceComment:'对比差异评论',
+  fullTextComments:'全文评论',
 }