Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java

@@ -26,4 +26,6 @@ public class BaseVehmodelConfigVehicleVos implements Vo {
     private String configName;
     @ApiModelProperty(value = "常用配置sid")
     private String configSid;
+    @ApiModelProperty(value = "内部编码")
+    private String insideCode;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -338,7 +338,8 @@
         bmc.`configName`,
         bmc.sid as configSid,
         bvc.`guidedPrice`,
-        bvc.manufactorSettlementPrice
+        bvc.manufactorSettlementPrice,
+        bvc.insideCode
         FROM
         base_vehmodel_config bvc
         LEFT JOIN base_vehicle_model bvm