diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java index bdf7a9a58d..711519a4bf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java @@ -12,6 +12,6 @@ import lombok.Data; @Data public class BaseManufacturerListQuery implements Query { private static final long serialVersionUID = -8298971718012436562L; - @ApiModelProperty("分公司sid") - private String useOrgSid; + @ApiModelProperty("车型sid") + private String modelSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java index ab37f95a5d..b10067e107 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java @@ -34,4 +34,8 @@ public class BaseVehmodelConfigVos implements Vo { private Integer num; @ApiModelProperty(value = "内部编码") private String insideCode; + @ApiModelProperty("品牌sid") + private String brandSid; + @ApiModelProperty("品牌名称") + private String brandName; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java index 0f684e0176..07e20bff99 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java @@ -118,7 +118,7 @@ public interface BaseManufacturerMapper extends BaseMapper { List> bankNamesDown(String manufacturerSid); - List selectNameByOrg(@Param("useOrgSid") String useOrgSid, @Param("supplierTypeValue") String supplierTypeValue); + List selectNameByOrg(@Param("modelSid") String modelSid); BaseManufacturer fetchByManBankSid(String s); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index 5f3017221d..29c811f1f6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -166,7 +166,13 @@