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

chenlu

2024-05-23 0a567fd9c3baeb8022c77fa1a6a96d4c60cfa11c

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java

@@ -24,4 +24,6 @@
    boolean reviewProcessById(String id, Integer status);

    boolean updateMoney(@Param("order") Order order);

    Integer cancelOrder(String id);
}