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