Merge remote-tracking branch 'origin/dev_20230808_OTA'

# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

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

@@ -1926,5 +1926,32 @@ module.exports = {
   processInitiationOne:'Process Initiation',
   taskHandlingOne:'Task Handling',
   taskReview:'Task Review',
+  softwareversion:'Software version',
+  softwareplatform:'Software platform',
+  softwarereleasetime:'Software release time',
+  theme:'theme',
+  influencestatute:'Influence statute',
+  vdrste:'VDR status',
+  impactdescription:'Impact description',
+  authenticationimpact:'Authentication impact',
+  impactstatement:'Impact statement',
+  certificationdeclaration:'Certification declaration',
+  matchingstate:'Matching state',
+  issuenotice:'Issue notice',
+  applyforrematch:'Apply for rematch',
+  notificationsent:'Is a notification sent?',
+  VDRDetails:'VDR Details',
+  applicationprojectversion:'Application project version',
+  selectlocked:'You can select only the data whose matching status is locked',
+  otastatus:'OTA status',
+  Matchingstatestatistics:'Matching state statistics',
+  OTaauthenticationprogressstatistics:'OTA authentication progress statistics',
+  tobematched:'To be matched',
+  Pendingapproval:'To be approved',
+  lock:'lock',
+  datacannotbeedited:'This data cannot be edited',
+  Rematchornot:'Rematch or not',
+  Modifyremarks:'Modify remarks',
+  Reasonforreturn:'Reason for return',
   maintenanceTemplate:'Maintenance template',
 }

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

@@ -3883,4 +3883,31 @@ module.exports = {
   taskHandlingOne:'任务办理',
   taskReview:'任务审查',
   maintenanceTemplate:'维护模板',
+  softwareversion:'软件版本',
+  softwareplatform:'软件平台',
+  softwarereleasetime:'软件发布时间',
+  theme:'主题',
+  influencestatute:'影响法规',
+  vdrste:'VDR状态',
+  impactdescription:'影响描述',
+  authenticationimpact:'认证影响',
+  impactstatement:'影响说明',
+  certificationdeclaration:'认证申报',
+  matchingstate:'匹配状态',
+  issuenotice:'下发通知',
+  applyforrematch:'申请重新匹配',
+  notificationsent:'是否下发通知？',
+  VDRDetails:'VDR详情',
+  applicationprojectversion:'应用项目版本',
+  selectlocked:'只能选择匹配状态为锁定的数据',
+  otastatus:'OTA状态',
+  Matchingstatestatistics:'匹配状态统计',
+  OTaauthenticationprogressstatistics:'OTA认证进度统计',
+  tobematched:'待匹配',
+  Pendingapproval:'待审批',
+  lock:'锁定',
+  datacannotbeedited:'该数据不能进行编辑',
+  Rematchornot:'是否重新匹配',
+  Modifyremarks:'修改备注',
+  Reasonforreturn:'退回原因'
 }