Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/components/uploadFileChangeDown/file.vue

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

@@ -872,7 +872,8 @@ module.exports = {
   yellowSchedule: 'Yellow: non conformance / to be tracked, with acceptable scheme and schedule',
   greenRequirements: 'Green: confirm that it meets or meets the current requirements',
   blueUndeterminedState: 'Blue: undetermined state',
-  authenticationMessage: 'Authentication Message',
+  authenticationMessage: 'Homo Parameter Task',
+  taskRegulationComplianceTask: 'Regulation Compliance Task',
   accept: 'Accept',
   notLaunch: 'Not start',
   refuse: 'Reject',
@@ -959,7 +960,9 @@ module.exports = {
   question: 'Question',
   ConfirmQuestion: 'Confirm Question',
   disableInput: 'Disable input',
-  OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out',
+  taskConfirmationDeadline: 'Task Confirmation Deadline',
+  OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out'
+  taskConfirmationResponsiblePerson:'Task confirmation of responsible person',
   or: 'or',
   warningTime: 'Warning time',
   RegulationMonthlyManagement: 'Regulation Monthly Management',

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

@@ -963,8 +963,10 @@ module.exports = {
   documentLibraryDetails: '文档库详情',
   question: '催办',
   ConfirmQuestion: '确认催办？',
-  OnlyOrTaskconfirmationOut: '只有清单确认状态或任务确认状态为待确认时才可以进行催办',
-  disableInput: '禁止输入',
+  OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办',
+  disableInput:'禁止输入',
+  taskConfirmationDeadline:'任务确认截止时间',
+  taskConfirmationResponsiblePerson:'责任人任务确认',
   or: '或',
   warningTime: '预警时间',
   RegulationMonthlyManagement: '法规月报管理',