Merge branch 'holiday-price' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelHolidayPriceBiz.java

@@ -122,6 +122,7 @@ public class VehicleModelHolidayPriceBiz extends BaseBiz<VehicleModelHolidayPric
         if (StringUtils.isNotEmpty(vehicleModelHolidayPriceFindDTO.getFestival()) && vehicleModelHolidayPriceFindDTO.getFestival().trim().length() > 0) {
             criteria.andLike("festival", String.format("%%%s%%", vehicleModelHolidayPriceFindDTO.getFestival()));
         }
+        criteria.andEqualTo("isDel",0);
         List<VehicleModelHolidayPrice> holidayPrices = mapper.selectByExample(example);
         if (CollectionUtils.isEmpty(holidayPrices)) {
             return vehicleModelHolidayPriceVos;