Merge branch 'holiday-price' into dev

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

@@ -137,6 +137,7 @@ public class VehicleModelHolidayPriceBiz extends BaseBiz<VehicleModelHolidayPric
             Date endDate = listMap.get(festivalId).stream().map(VehicleModelHolidayPrice::getFestivalDay).max(Date::compareTo).get();
             vehicleModelHolidayPriceVo.setStartDate(startDate);
             vehicleModelHolidayPriceVo.setEndDate(endDate);
+            vehicleModelHolidayPriceVo.setId(Long.valueOf(festivalId));
             vehicleModelHolidayPriceVos.add(vehicleModelHolidayPriceVo);
         }
         return vehicleModelHolidayPriceVos;