Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

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

@@ -327,9 +327,7 @@ public class VehicleActiveService {
                     while (iterator.hasNext()) {
                         VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
                         //未出车且超过出车时间和已出车的和本条记录过滤，剩下为正常未出车记录
-                        if (arrivalVo.getBookRecordId().equals(vehicleBookRecordVo.getId())) {
-                            iterator.remove();
-                        } else if ( ((vehicleBookRecordVo.getBookStartDate().getTime() - vehicleBookRecord.getBookEndDate().getTime() > 0))) {
+                        if ((arrivalVo.getBookRecordId().equals(vehicleBookRecordVo.getId())) || ((vehicleBookRecordVo.getBookStartDate().getTime() - vehicleBookRecord.getBookEndDate().getTime() > 0))) {
                             iterator.remove();
                         }
                     }