销售订单-车型及车型配置添加更多配置及车型配置

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;
+
 }

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;
+
 }

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,

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),