Merge branch 'master' into 'fix_bug_first_stage'

# Conflicts: # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js
2022-08-24 10:15:59 +08:00
parent 0b34c20510 708e851b77
commit 3fa5e31e2a
45 changed files with 1746 additions and 706 deletions
@@ -1275,4 +1275,7 @@ module.exports = {
  taskConfirmedPersonnelCannotBeSetBatch:'When the task confirmation status is to be confirmed, personnel cannot be set in batch',
  theSelectedDataResponsibilityFieldCannotEmpty:'The selected data responsibility field cannot be empty',
  theTaskConfirmationStatusCannot:'Only the list confirmation status is "reject" or "accept" and the task confirmation status cannot be "data to be confirmed"',
+  BatchMaintenanceProgress:'Batch Maintenance Progress',
+  BatchChangeStatus:'Batch Change Status',
+  CollectinguthenticationParameters:'Collecting Authentication Parameters',
 }