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-06-21 18:02:32 +08:00
parent d9b15d0afd 7305f365ab
commit 665da1bcb3
5 changed files with 345 additions and 5 deletions
@@ -954,4 +954,6 @@ module.exports = {
  disableInput: 'Disable input',
  OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out',
  or: 'or',
+  OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out',
+  warningTime:'Warning time',
 }
@@ -959,4 +959,5 @@ module.exports = {
  OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办',
  disableInput:'禁止输入',
  or: '或',
+  warningTime:'预警时间',
 }