From aa0bdc39975d948873eb0ea80b27603894dd4e98 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 11 May 2022 16:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=8A=E8=BD=A6=E5=9E=8B=E9=85=8D=E7=BD=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9B=B4=E5=A4=9A=E9=85=8D=E7=BD=AE=E5=8F=8A=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/basemodelconfig/BaseModelConfigListVo.java     | 3 +++
 .../base/api/basevehiclemodel/BaseVehicleModelListVo.java   | 6 +++---
 .../base/biz/basemodelconfig/BaseModelConfigMapper.xml      | 1 +
 .../base/biz/basevehiclemodel/BaseVehicleModelMapper.xml    | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListVo.java
index 4f2565f827..bac4c097b6 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListVo.java
@@ -62,4 +62,7 @@ public class BaseModelConfigListVo implements Vo {
     @ApiModelProperty(value = "厂家结算价")
     private String manufactorSettlementPrice;
 
+    @ApiModelProperty(value = "更多配置")
+    private String otherConfig;
+
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java
index 4593effbb5..6955900e11 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java
@@ -1,8 +1,5 @@
 package com.yxt.anrui.base.api.basevehiclemodel;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,4 +34,7 @@ public class BaseVehicleModelListVo implements Vo {
     @ApiModelProperty(value = "分公司")
     private String company;
 
+    @ApiModelProperty(value = "车型配置")
+    private String modelName;
+
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
index d38ab4c47f..01386099f0 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
@@ -318,6 +318,7 @@
                bc.independentSources,
                bc.fuelTank,
                bc.multimedia,
+               bc.otherConfig,
                bc.carColor,
                bvc.guidedPrice,
                bvc.manufactorSettlementPrice,
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
index a6a6e30bc2..123c190edf 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
@@ -338,6 +338,7 @@
         bm.fuelTypeValue,
         bm.gearboxTypeValue,
         bvc.manufactorSettlementPrice,
+        bm.modelName,
         (SELECT
         CONCAT(
         MIN(bvc.guidedPrice),