From 25228ddd0009df7d6e5becaea8851508bbeef87d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 13:29:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
index ca2e9de..8b834fd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
@@ -94,17 +94,17 @@
 
     /**
      * 订单配送
-     * @param orderId 订单id
+     * @param orderDeliverDTO 订单信息
      * @return 配送结果
      */
-    R deliverOrder(Long orderId);
+    R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);
 
     /**
      * 订单完成配送
-     * @param orderId 订单id
+     * @param orderDeliverDTO 订单信息
      * @return 完成配送结果
      */
-    R finishDeliverOrder(Long orderId);
+    R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);
 
     /**
      * 获取订单导出数据

--
Gitblit v1.7.1