Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/dituhui/pea/order/common/CapacityUtils.java

@@ -125,8 +125,8 @@ public class CapacityUtils {
         LocalDateTime preLast = startTime;
         LocalDateTime preLast = startTime;
         for (OccupyInfo o : occupyInfos) {
         for (OccupyInfo o : occupyInfos) {
             if (o.getBeginTime().isAfter(preLast)) {
             if (o.getBeginTime().isAfter(preLast)) {
-                long duraionMiu = Duration.between(startTime, o.getBeginTime()).abs().toMinutes();
-                leisureTime.add(new OccupyInfoDetail(startTime, o.getBeginTime(), duraionMiu));
+                long duraionMiu = Duration.between(preLast, o.getBeginTime()).abs().toMinutes();
+                leisureTime.add(new OccupyInfoDetail(preLast, o.getBeginTime(), duraionMiu));
             }
             }
             preLast = o.getEndTime();
             preLast = o.getEndTime();
         }
         }