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

chenlu

2024-03-29 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348

 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)  {