From a1524afe5eb74cf9e6dd7bfb88222944b3eb10bf Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 14 一月 2025 15:31:50 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 a62c6df..d7c9cc0 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,9 +131,9 @@ @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){ - orderService.writeOff(id, shopId); + @GetMapping("/writeOff/{id}/{shopId}/{technicianId}") + public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId, @PathVariable("technicianId") Integer technicianId){ + orderService.writeOff(id, shopId, technicianId); return R.ok(); } -- Gitblit v1.7.1