Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-03-19 ecb3045fb71d05b7ee3bf73fdf413f5091d65f65

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -45,6 +45,13 @@
    public Result deleteOrder(@PathVariable String id)  {
        return Result.seccess(orderService.deleteOrder(id));
    }

    @ApiOperation("订单作废")
    @PostMapping("/cancelOrder/{id}")
    public Result cancelOrder(@PathVariable String id)  {
        return Result.seccess(orderService.cancelOrder(id));
    }

    @ApiOperation("根据id获取订单信息")
    @PostMapping("/getOrderById/{id}")
    public Result getOrderById(@PathVariable String id)  {