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

云

2026-04-28 a7dd93b840bdce4bd0011bc948157f440514a207

 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);