Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

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

@@ -895,6 +895,7 @@ module.exports = {
   pleaseConformityVerification: 'Please complete the data of Conformity verification',
   virtualListDetails: 'Virtual List Details',
   virtualAuthenticationListDetails: 'Virtual Authentication List Details',
+  VirtualAuthenticationList: 'Virtual Authentication List',
   maintainVirtualList: 'Maintain Virtual List',
   certificationListMaintenance: 'Certification List Maintenance',
   reasonsForRejection: 'Reasons For Rejection',
@@ -1431,6 +1432,10 @@ module.exports = {
   onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected',
   youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved',
   batchmodify:'Whether to batch modify',
+  onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected',
+  type:'type',
+  select:'select',
+  onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted',
   registrationnumber:'Product registration number',
   noticebatch:'Notice batch',
   producttrademark:'Product Trademark',

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

@@ -907,6 +907,7 @@ module.exports = {
   pleaseConformityVerification: '请补全验证符合性确认的数据',
   virtualListDetails: '虚拟清单详情',
   virtualAuthenticationListDetails: '虚拟认证清单详情',
+  VirtualAuthenticationList: '虚拟认证清单',
   maintainVirtualList: '维护虚拟清单',
   certificationListMaintenance: '认证清单维护',
   reasonsForRejection: '驳回原因',
@@ -1533,6 +1534,10 @@ module.exports = {
   onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据',
   youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据',
   batchmodify:'是否批量修改',
+  onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据',
+  type:'类型',
+  select:'选择',
+  onlyDataWithProcessStatusDeleted:'只能删除流程状态为清单待发布和审查通过的数据',
   registrationnumber:'产品登记编号',
   noticebatch:'《公告》批次',
   producttrademark:'产品商标',