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-27 17:48:12 +08:00
parent 44f92682f7 3f6efd5f80
commit 00f5cf0b5b
6 changed files with 226 additions and 154 deletions
@@ -1191,4 +1191,5 @@ module.exports = {
  Fileuploaded:'File uploaded, please wait',
  uploadedbyyourself:'You can only delete files and data uploaded by yourself',
  Fileuploaded:'File uploading, please wait',
+  doNotHavePermissionDeleteData:'Do not have permission to delete this data,'
 }