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

buhuazhen

5 天以前 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170

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