Merge branch 'master-vehicle-price' into dev-tiande

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -173,7 +173,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
                         }
 
                         //如果"必须在这时间前预定" 存在 并且 比预定结束时间 要早，那么不允许预定
-                        if(null != usableVeicleVO.getToReturnMustBeforeDate() && DateUtil.date(dto.getEndDateTamp()).isBeforeOrEquals(usableVeicleVO.getToReturnMustBeforeDate())) {
+                        if(null != usableVeicleVO.getToReturnMustBeforeDate() && DateUtil.date(dto.getEndDateTamp()).isAfterOrEquals(usableVeicleVO.getToReturnMustBeforeDate())) {
                             usableVeicleVO.setAllowRent(SYS_FALSE);
                         }