Merge remote-tracking branch 'origin/master'

mitao

2024-06-19 d4f159d60acf6f263bfa4508a113c0feacd2f5b9

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java

@@ -66,6 +66,13 @@
        return R.ok();
    }

    @PostMapping("/delOrderOne")
    @ApiOperation(value = "用户端-删除订单")
    public R delOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
        orderService.removeById(memberOrderListDTO.getId());
        return R.ok();
    }

    @PostMapping("/AffirmOrderOne")
    @ApiOperation(value = "用户端-确认收货订单")
    public R AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {