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
@@ -1377,4 +1377,7 @@ module.exports = {
  taskConfirmedPersonnelCannotBeSetBatch:'任务确认状态为待确认时无法批量设置人员',
  theSelectedDataResponsibilityFieldCannotEmpty:'所选数据责任领域不能为空',
  theTaskConfirmationStatusCannot:'只能变更清单确认状态为拒绝或接受、及任务确认状态不能为待确认的数据',
+  BatchMaintenanceProgress:'批量维护进度',
+  BatchChangeStatus:'批量修改状态',
+  CollectinguthenticationParameters:'认证参数收集',
 }