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

maven

2026-03-10 db807b8e9464af69217f813240e55d9e9b3b4cdb

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