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

@@ -1483,7 +1483,9 @@ module.exports = {
   technicalparameters:'Upgrade Bulletin technical parameters that may change (if any)',
   architecturetopologydiagram:'System - Electronic Controller Architecture Topology diagram (Attachment includes topology diagram description)',
   controllerparameter:'Controller parameter',
-  electroniccontrollername:'Electronic controller name "Hardware"',
+  electronic:'Electronic controller name',
+  electronicController:'Electronic controller name (Hardware)',
+  electroniccontrollername:'Electronic Controller Vehicle Safety Integrity Level (ASIL)',
   electroniccontrollerproductionenterprises:'Electronic controller production enterprises',
   electroniccontrollertype:'Electronic controller type',
   hardwareversioninformation:'Hardware version information',
@@ -1685,4 +1687,7 @@ module.exports = {
   forwardXquantity:'For example, forward X quantity, backward X quantity, right X quantity, etc',
   upgraderecordnumber:'Upgrade record number',
   Modelandfunctionrecord:'Model and function record "Announcement" batch',
+  taskTypeMismatch:'Task Type Mismatch',
+  taskNodeMismatch:'Task Node Mismatch',
+  ifNot:'If not, fill in "none" or "not involved"',
 }

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

@@ -1585,6 +1585,8 @@ module.exports = {
   technicalparameters:'升级可能变更的《公告》技术参数(如有)',
   architecturetopologydiagram:'系统-电子控制器架构拓扑图(附件需含拓扑图介绍)',
   controllerparameter:'控制器参数',
+  electronic:'电子控制器名称',
+  electronicController:'电子控制器名称(硬件)',
   electroniccontrollername:'电子控制器汽车安全完整性等级(ASIL)',
   electroniccontrollerproductionenterprises:'电子控制器生产企业',
   electroniccontrollertype:'电子控制器型号',
@@ -1785,6 +1787,7 @@ module.exports = {
   forwardXquantity:'如前向X数量，后向X数量，右向X数量等',
   upgraderecordnumber:'升级备案编号',
   Modelandfunctionrecord:'车型及功能备案《公告》批次',
-
-
+  taskTypeMismatch:'任务类型不匹配',
+  taskNodeMismatch:'任务节点不匹配',
+  ifNot:'如无，则填写“无”或“不涉及”',
 }