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

guoyujie

2025-07-14 16bbf8260110e2790f304e8421cf7591837ca302

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

@@ -27,6 +27,10 @@

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

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

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

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

    List <Map<String, Object>> getSelectDeliveryDetailPrinting(@Param("deliveryId") String deliveryId,