合并分支 'dev_2nd_period_test' 到 'master'

Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!244

jero-web/src/common/lang/en-us.js

@@ -1028,7 +1028,7 @@ module.exports = {
   viewProcess: 'View Process',
   evaluationResults: 'Evaluation Results',
   Assessor: 'Assessor',
-  collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
+  collectionOfRegulatoryOpinions: 'Opinion Collection of Regulation',
   collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
   feedbackInformation: 'Feedback',
   relevantSections: 'Chapter',
@@ -1211,7 +1211,7 @@ module.exports = {
   Inthecollection: 'During collection',
   Notatthe: 'Not started',
   Thepercentage: 'The Percentage',
-  problemKnowledgeBase: 'Q&A Knowledge',
+  problemKnowledgeBase: 'Knowledge Sharing',
   recentHotSpots: 'Recent Hot Spots',
   disseminationMaterials: 'Dissemination Materials',
   informationSafety: 'Information Safety',
@@ -1291,8 +1291,8 @@ module.exports = {
   rejectedBy:'Rejected By',
   rejectionTime:'Rejection Time',
   rejectReason:'Reject Reason',
-  collectionLegislativeComments:'Collection of Legislative Comments',
-  regulatoryAndTechnicalAssessment:'Regulatory and technical assessment',
+  collectionLegislativeComments:'Opinion Collection of Regulation',
+  regulatoryAndTechnicalAssessment:'Regulation Technical Assessment',
   listConfirmationRejectionReason:'List confirmation rejection reason',
   taskConfirmationRejectionReason:'Task confirmation rejection reason',
   onlyCompletedDataCanBeDeleted:'Only completed data can be deleted',

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

@@ -1313,7 +1313,7 @@ module.exports = {
   Inthecollection: '收集中',
   Notatthe: '未开始',
   Thepercentage: '百分比',
-  problemKnowledgeBase: '问题知识库',
+  problemKnowledgeBase: '知识分享',
   recentHotSpots: '近期热点',
   disseminationMaterials: '传播物料',
   informationSafety: '信息安全',