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-08-09 17:54:10 +08:00
32 changed files with 1312 additions and 134 deletions
+2
View File
@@ -1253,4 +1253,6 @@ module.exports = {
attachmentUpload:'file',
textInput:'Text Input',
deleteNode:'If any file information exists, it will be deleted',
HaveReleased:'Have released',
forward:'Forward',
}