Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java

@@ -50,6 +50,8 @@ public class BaseVehicleOutApplyQueryNew implements Query {
 
     @ApiModelProperty("业务状态")
     private String isDelete;
+    @ApiModelProperty("车型配置简称")
+    private String modelName;
     @ApiModelProperty("物料编码")
     private String materialCode;
     @ApiModelProperty("车架号")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -124,6 +124,10 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
             if (StringUtils.isNotBlank(params.getIsDelete())) {
                 qw.eq("bvo.isDelete", params.getIsDelete());
             }
+            //车型配置简称
+            if (StringUtils.isNotBlank(params.getModelName())) {
+                qw.like("bv.modelName", params.getModelName());
+            }
             //物料编码
             if (StringUtils.isNotBlank(params.getMaterialCode())) {
                 qw.like("bvo.materialCode", params.getMaterialCode());