Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-16 6269dc7a50d5028fa616b339cfe790b6e0d5d16e

 oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java

@@ -100,11 +100,11 @@
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }

    @Log("关闭订单")
    @ApiOperation("关闭订单")
    @PostMapping(value = "/closeOrder")
    public ResponseEntity<Object> closeOrder(@RequestParam String orderNum) {
        orderService.closeOrder(orderNum);
    @Log("用户取消订单")
    @ApiOperation("用户取消订单")
    @PostMapping(value = "/cancel")
    public ResponseEntity<Object> cancel(@RequestParam String orderNum) {
        orderService.cancel(orderNum);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }