Merge remote-tracking branch 'origin/holiday-price' into holiday-price

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleModelDayPriceVo.java

@@ -33,4 +33,6 @@ public class VehicleModelDayPriceVo extends VehicleModelDTO implements Serializa
      * 会员等级
      */
     private Integer level;
+
+    private Integer freeDays;
 }

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

@@ -146,6 +146,8 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
             vehicleModelDayPriceVo.setPrice(aPrice);
             Integer level = isNullOfVehicleModelPrice ? null : vehicleModelCalendarPriceMap.get(vehicleModelDTO.getVehicleModelId()).getLevel();
             vehicleModelDayPriceVo.setLevel(level);
+            Integer freeDays = isNullOfVehicleModelPrice ? null : vehicleModelCalendarPriceMap.get(vehicleModelDTO.getVehicleModelId()).getFreeDays();
+            vehicleModelDayPriceVo.setFreeDays(freeDays);
             vehicleModelDayPriceVos.add(vehicleModelDayPriceVo);
         }
         return vehicleModelDayPriceVos;