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

guoyuji

2024-03-22 81df1dcdb77b01b4a957b2b0725f3a91cfc0f72a

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