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

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

@@ -74,6 +74,6 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
 
     public void initDate() {
         this.startDate = DateUtil.date(getStartTime());
-        this.endDate = DateUtil.date(getEndDate());
+        this.endDate = DateUtil.date(getEndTime());
     }
 }