Merge remote-tracking branch 'origin/feature_dev_20221025_message' into dev_2nd_period_test

# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

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

@@ -1350,4 +1350,13 @@ module.exports = {
   listToConfirm:'List to confirm',
   toSubmit:'To submit',
   toAudit:'To audit',
+  secondaryDirectory:'Secondary Directory',
+  OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
+  projectVersion:'Project Version',
+  softwareVersion:'Authentication Software version',
+  versionStatistics:'Version statistics',
+  addSubproject:'Add Subproject',
+  Topping:'Topping',
+  cancelTopping:'Cancel Topping',
+  relatedProjectVersion:'Related project version',
 }

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

@@ -1451,4 +1451,13 @@ module.exports = {
   listToConfirm:'待确认',
   toSubmit:'待提交',
   toAudit:'待审核',
+  secondaryDirectory:'二级目录',
+  OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员',
+  projectVersion:'项目版本',
+  softwareVersion:'认证软件版本',
+  versionStatistics:'版本统计',
+  addSubproject:'添加子项目',
+  Topping:'置顶',
+  cancelTopping:'取消置顶',
+  relatedProjectVersion:'相关项目版本',
 }