Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-05-07 fcd6de629c4f6b8d9e610da854f15ef40115b058

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

@@ -47,6 +47,7 @@
        return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
    }
    @ApiOperation("删除订单")
    @SaCheckPermission("selectOrder.delete")
    @PostMapping("/deleteOrder/{id}")
    public Result deleteOrder(@PathVariable String id)  {
        return Result.seccess(orderService.deleteOrder(id));