Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-02-18 07da32cf1f3afab98665cc245bd6b8c6b144e8d4

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java

@@ -25,7 +25,7 @@

    Integer getSelectShippingOrderDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);

    List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryId") String deliveryId);
    List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryId") String deliveryId,@Param("type") String type);

    List<OrderDetail> getSelectOrderPrinting(Object productId, String orderId);