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

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
zyx.net
2022-07-18 11:20:23 +08:00
11 changed files with 709 additions and 2 deletions
+3
View File
@@ -1151,6 +1151,9 @@ module.exports = {
CommentsCollectionResultsForReference:'Comments Collection Results For Reference',
TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference',
ComplianceConfirmationRecord:'Compliance Confirmation Record',
noComparisonDocumentSelected:'No comparison document selected',
RemarkInfo:'Remarks Info',
initiateDocumentComparison:'Initiate Document Comparison',
Deriveconformanceresults:'Derive Conformance Results',
Regulatorycompliancekanban:'Regulatory Compliance Kanban',
}
+3
View File
@@ -1157,4 +1157,7 @@ module.exports = {
ComplianceConfirmationRecord:'符合性确认记录',
Deriveconformanceresults:'导出符合性结果',
Regulatorycompliancekanban:'法规符合性看板',
noComparisonDocumentSelected:'未选择对比文档',
RemarkInfo:'备注信息',
initiateDocumentComparison:'发起文档对比',
}