Merge remote-tracking branch 'origin/master'

mitao

2024-06-13 464254ba0e542c22fac68c7512f06a9a8df34b28

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

@@ -59,7 +59,7 @@
    @PostMapping("/CancelOrderOne")
    @ApiOperation(value = "用户端-取消订单")
    public R CancelOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
        orderService.MemberOrderOne(memberOrderListDTO);
        orderService.CancelOrderOne(memberOrderListDTO);
        return R.ok();
    }