From f5c068f72edc9737569722921090937b84514f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 24 Aug 2023 10:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/ota/entity/OtaManageApplyEO.java  | 10 +++++++---
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java  |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
index 1a02c1d25..5408c129a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
@@ -89,16 +89,20 @@ public class OtaManageApplyEO implements Serializable {
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
 
+
+    /**适用车型*/
+    @Excel(name = "适用车型", width = 15)
     @ApiModelProperty(value = "适用车型")
-    private java.lang.String appliedVehicleProject;
-
-
+    private java.lang.String vehicleType;
 	//--------------------------------------------------------
 
     @TableField(exist = false)
     @ApiModelProperty(value = "软件版本")
     private java.lang.String plannedBpLaunchBatch;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "适用车型")
+    private java.lang.String appliedVehicleProject;
 
 
     @TableField(exist = false)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 3e51a23e2..25d9ec68b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -1114,9 +1114,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     || oma.getMatchStatus().equals(OtaStatusEnum.NA.getKey()))) {
                 //状态不对
                 if (CutEnum.CN.getValue().equals(cut)) {
-                    msgList.add("VDR:" + oma.getVdr() + " 状态必须为" + OtaStatusEnum.TO_BE_MATCHED.getNameCN() + " 或" + OtaStatusEnum.REJECTED.getNameCN() + "！");
+                    msgList.add("VDR:" + oma.getVdr() + " 状态必须为" + OtaStatusEnum.TO_BE_MATCHED.getNameCN() + " 或 " + OtaStatusEnum.REJECTED.getNameCN() + "！");
                 } else {
-                    msgList.add("VDR:" + oma.getVdr() + " The state must be" + OtaStatusEnum.TO_BE_MATCHED.getNameEN() + " or" + OtaStatusEnum.REJECTED.getNameEN() + "！");
+                    msgList.add("VDR:" + oma.getVdr() + " The state must be" + OtaStatusEnum.TO_BE_MATCHED.getNameEN() + " or " + OtaStatusEnum.REJECTED.getNameEN() + "！");
                 }
             } else {
                 oma.setMatchStatus(OtaStatusEnum.TO_BE_APPROVED.getKey());