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

jero-web/src/common/lang/en-us.js

@@ -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',
 }

jero-web/src/common/lang/zh-cn.js

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