From 720b429a22d78024097df94d84ce1be66413d2ca Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 24 Aug 2022 14:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basemodelmodprice/BaseModelModpriceService.java | 1 - .../com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java | 4 ++-- .../com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java | 2 ++ .../yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 2531039104..1ef93ad25e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -40,7 +40,6 @@ import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig; import com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService; import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigMapper; -import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java index deaf09e041..7604d7a35e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java @@ -51,8 +51,8 @@ public class ScmVehRebateQuery implements Query { @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("车型sid") - private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("创建开始日期") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java index b5d22713e5..890375cf62 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java @@ -57,6 +57,8 @@ public class ScmVehRebateVo implements Vo { @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; // 创建日期 + @ApiModelProperty("状态") + private String state; // 状态 @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 54e898e336..32fd590d91 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -68,8 +68,8 @@ public class ScmVehRebateService extends MybatisBaseService