Merge branch 'dev_20230516_LCCZ'

# 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

@@ -1835,4 +1835,8 @@ module.exports = {
   expectedDeliveryTime:'Expected Delivery Time',
   changeAuthor:'Change Author',
   requireddataisnull:'Required data is null',
+  theProcessThatNeedsToBeReset:'The process that needs to be reset',
+  toResubmit:'To Resubmit',
+  selectDesignConformanceAsConformance:'Select Design Conformance verification process state as Conformance or Verify conformance verification process state as conformance obtained data',
+  submissionProcess:'Submission Process',
 }

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

@@ -1936,4 +1936,8 @@ module.exports = {
   expectedDeliveryTime:'预计交付时间',
   changeAuthor:'更改作者',
   requireddataisnull:'必填数据为空',
+  theProcessThatNeedsToBeReset:'需要重置的流程',
+  toResubmit:'重新提交',
+  selectDesignConformanceAsConformance:'请选择设计符合性确认流程状态为符合或验证符合性确认流程状态为符合的数据',
+  submissionProcess:'提交流程',
 }