Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into test

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -191,7 +191,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public List<OrderChild> getOrderChildBussInfo(String truckNo) {
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper();
         query.eq(OrderChild::getTruckNo, truckNo)
-                .eq(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE);
+                .in(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE,OrderChildEnum.Status.COMPLETE);
         return baseMapper.selectList(query);
     }