Merge branch 'holiday-price' into dev

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

@@ -361,8 +361,8 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                 free_days = (Integer) price_freeDays_map.get(DAYS_VAL);
                 no_discount_price = (BigDecimal) price_freeDays_map.get(BASE_PRICE_VAL);
             }
-            vehicleModelCalendarPriceDTO.setNo_discount_price(no_discount_price);
-            vehicleModelCalendarPriceDTO.setPrice(vehicle_price);
+            vehicleModelCalendarPriceDTO.setNo_discount_price(no_discount_price.setScale(2, BigDecimal.ROUND_HALF_UP));
+            vehicleModelCalendarPriceDTO.setPrice(vehicle_price.setScale(2, BigDecimal.ROUND_HALF_UP));
             vehicleModelCalendarPriceDTO.setFreeDays(free_days);
             final_startLocalDate = final_startLocalDate.plusDays(1);
             vehicleModelCalendarPriceVos.add(vehicleModelCalendarPriceDTO);