合并代码

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1274,7 +1274,7 @@ public class OrderChildServiceImpl implements OrderChildService {
     /**
      * 更新货单完成状态
      */
-    private void updateOrderGoodsComplete(OrderGoods orderGoods, long count) {
+    private void updateOrderGoodsComplete(OrderGoods orderGoods, OrderChild orderChild, long count) {
         if (count > 1) {
             return;
         }