Merge branch 'holiday-price' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/VehicleItemDTO.java

@@ -217,9 +217,9 @@ public class VehicleItemDTO extends OrderItem {
         private Integer sameUnitPrice = 1;
 
         //免费数量
-        private Integer freeNum;
+        private Integer freeNum = 0;
 
         //免费金额
-        private BigDecimal freeAmount;
+        private BigDecimal freeAmount = BigDecimal.ZERO;
     }
 }