Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2026-04-23 a228c5f91173c50ce7f94255dc9a25a7c6703e0c

 src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java

@@ -21,7 +21,7 @@

    List<ShippingInfo> listAll();

    List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId);
    List<SalesLedgerProductDto> getReturnManagementDtoById(@Param("shippingId")Long shippingId);

    List<ShippingInfo> getShippingInfoByCustomerName(String customerName);