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

云

2026-04-17 ac11e0a1320b469a2a111ba3d6a4a54f424845b7

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -479,6 +479,8 @@
                        .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
                        .orderByDesc(ShippingInfo::getCreateTime)
                        .last("limit 1"));
                product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
                product.setShippingDate(shippingInfo.getShippingDate());
                if (shippingInfo != null) {
                    product.setShippingStatus(shippingInfo.getStatus());
                }