From 35de4ec51dc2bb3c1ae73fb8a66f10d53a4b1a0d Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期四, 22 四月 2021 15:20:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java | 5 ++--- 1 files changed, 2 insertions(+), 3 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 8b834fd..9aceeae 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 @@ -50,11 +50,10 @@ /** * 根据订单id取消订单 - * @param orderId 订单id - * @param phone 操作用户手机号 + * @param comShopOrderQueryDTO 订单信息 * @return 取消结果 */ - R orderCancel(Long orderId,String phone); + R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO); /** * 根据订单id删除订单 -- Gitblit v1.7.1