Merge remote-tracking branch 'origin/dev' into dev

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

@@ -154,6 +154,7 @@ public class VehicleModelHolidayPriceBiz extends BaseBiz<VehicleModelHolidayPric
         Example example = new Example(VehicleModelHolidayPrice.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andBetween("festivalDay", startDate, endDate);
+        criteria.andEqualTo("isDel",0);
         List<VehicleModelHolidayPrice> modelHolidayPrices = mapper.selectByExample(example);
         if (CollectionUtils.isEmpty(modelHolidayPrices)) {
             return vehicleModelHolidayPriceDTOS;