Merge remote-tracking branch 'origin/master'

3 years ago · 35b7a11aca
2 changed files with 4 additions and 1 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java
+++ b/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;
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/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