Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 384fa29861a5e62ef6b2a2a2b83e75302bed41dc

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java

@@ -45,11 +45,9 @@
    
    /**
     * 确认发货操作
     * @param orderId
     * @param code
     * @return
     */
    R confirmDelivery(Long orderId, String code);
    R confirmDelivery(ConfirmDelivery confirmDelivery);
    
    
    /**