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
2022-07-22 15:33:04 +08:00
parent c7dbf58f68 b98d32966a
commit 72aed53126
9 changed files with 1169 additions and 17 deletions
@@ -1168,5 +1168,9 @@ module.exports = {
  fullTextComments:'Full text comments',
  fileDeclaration:'file Declaration',
  FileForDetails:'File For Details',
+  Converting:'Converting',
+  convertNetwork:'Convert Network',
+  convertFailed:'Convert Failed',
+  standardData:'Standard Data',
  Theorganization:'The Organization',
 }
@@ -1172,5 +1172,9 @@ module.exports = {
  fullTextComments:'全文评论',
  fileDeclaration:'文件说明',
  FileForDetails:'文件详情',
+  Converting:'转换中',
+  convertNetwork:'转换完成',
+  convertFailed:'转换失败',
+  standardData:'标准数据',
  Theorganization:'组织机构',
 }