Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java

@@ -79,4 +79,7 @@ public class BaseDiscountpackageGetVehQuery implements Query {
     private String solidStartDate;
     @ApiModelProperty(value = "买断结束日期")
     private String solidEndDate;
+
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3540,6 +3540,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(params.getVehicleAlias())) {
             qw.like("bvm.vehicleAlias", params.getVehicleAlias());
         }
+        //车架号
+        if (StringUtils.isNotBlank(params.getVinNo())) {
+            qw.like("bv.vinNo", params.getVinNo());
+        }
         //快捷检索车型
         if (StringUtils.isNotBlank(params.getModelName())) {
             qw.like("bvm.modelName", params.getModelName());