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