Merge branch 'master' into dev_2nd_LCYH

# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue

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

@@ -1250,9 +1250,9 @@ module.exports = {
   dre: 'Dre',
   applicableInstructionsMarketList: 'Applicable instructions of market list',
   pleaseSelectTheDataCompared: 'Please select the data to be compared',
-  problemLabel: 'Topic Tag',
+  problemLabel: 'classification',
   personCharge: 'Person in charge',
-  addLabel: 'Add Tag',
+  addLabel: 'New Classification',
   editLabel: 'Edit Label',
   applicableMarket: 'Applicable Market',
   templateMaintenance: 'Template Maintenance',
@@ -1393,6 +1393,8 @@ module.exports = {
   beforedate:'In... Before  date',
   beforedatein:'In... Before  date (inclusive)',
   inRecentMonthsin6:'Within 6 months (implemented)',
+  batchUpdateDeadline:'Batch update deadline',
+  timeInterval:'Time Interval',
   certificationList:'Certification List',
   inspectionItems:'Inspection Items',
   processReset:'Process Reset',

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

@@ -1352,9 +1352,9 @@ module.exports = {
   dre: '填写人',
   applicableInstructionsMarketList: '市场清单适用说明',
   pleaseSelectTheDataCompared: '请选择需要对比的数据',
-  problemLabel: '问题标签',
+  problemLabel: '分类',
   personCharge: '负责人',
-  addLabel: '新增标签',
+  addLabel: '新增分类',
   editLabel: '编辑标签',
   applicableMarket: '适用市场',
   templateMaintenance: '模板维护',
@@ -1494,6 +1494,8 @@ module.exports = {
   beforedate:'在...日期之前',
   beforedatein:'在...日期之前（包含）',
   inRecentMonthsin6:'近6个月内（已实施）',
+  batchUpdateDeadline:'批量更新截止时间',
+  timeInterval:'时间区间',
   certificationList:'认证清单',
   inspectionItems:'检验项目',
   processReset:'流程重置',