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

guoyuji

2024-07-05 4098ea2b95d6da283ac62f2ebb30ce37fe0d6d3f

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

@@ -27,5 +27,7 @@

    Integer cancelOrder(String id);

    Integer selectOrder(@Param("order") Order order);
    List<Order> selectOrder(@Param("order") Order order);

    Integer selectMaxOrderIdByMonth();
}