Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-15 4afe59c57d73bcc443f963921eb9a5cf757713de

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -132,8 +132,8 @@
            @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
    })
    @GetMapping("/writeOff")
    public R<Void> writeOff(String id, Integer shopId, String technicianId){
        orderService.writeOff(id, shopId, technicianId);
    public R<Void> writeOff(String code, Integer shopId, String technicianId){
        orderService.writeOff(code, shopId, technicianId);
        return R.ok();
    }