From 1a5f7432c404946f9ec358b5cb6281a823c466c1 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 16:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 2f7bf18..76d0db7 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/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);
     
     
     /**

--
Gitblit v1.7.1