From 238ad8112dc926eeaad8e327607eeba7858b8a48 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 14 一月 2025 21:31:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java index 694eda2..992a1c5 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java @@ -131,8 +131,8 @@ @ApiImplicitParams({ @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"), }) - @GetMapping("/writeOff/{id}/{shopId}") - public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId, Integer technicianId){ + @GetMapping("/writeOff") + public R<Void> writeOff(String id, Integer shopId, String technicianId){ orderService.writeOff(id, shopId, technicianId); return R.ok(); } -- Gitblit v1.7.1