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-25 11:41:50 +08:00
8 changed files with 271 additions and 24 deletions
+2
View File
@@ -1182,4 +1182,6 @@ module.exports = {
Folderorder:'Folder Order',
Downloadprivileges:'Download Privileges',
Openpersonnel:'Open Personnel'
originalText:'Original Text',
translatedText:'Translated Text',
}