Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-20 5708e811e0afc640a96eafe3494710f19b127ae2

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

@@ -232,10 +232,10 @@
    
    
    
    @PutMapping("/confirmDelivery/{orderId}")
    @PostMapping("/confirmDelivery")
    @ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
    public R confirmDelivery(@PathVariable("orderId") String orderId, String code){
        return orderService.confirmDelivery(orderId, code);
    public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
        return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
    }