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/service/sd/OrderService.java

@@ -243,4 +243,9 @@
    }


    public Integer cancelOrder(String id) {
        return orderMapper.cancelOrder(id);
    }


}