Merge branch 'master-zhengyi' into dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderTimeServiceImpl.java

@@ -254,7 +254,7 @@ public class OrderTimeServiceImpl extends AbstractService<OrderTimeMapper, Order
                 backList.add(enList.get(0));
             }
         }
-        backList = backList.stream().sorted(Comparator.comparing(OrderTimeDO::getId)).collect(Collectors.toList());
+        backList = backList.stream().filter(t -> t.getStatus() != 15).sorted(Comparator.comparing(OrderTimeDO::getId)).collect(Collectors.toList());
         return OrderTimeConvert.INSTANCE.convertList(backList);
     }
 }