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/DeliveryMapper.java

@@ -36,6 +36,8 @@
                                        @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                        @Param("order") Order order);

    Order selectOrderId(String orderId);

    Map<String,Integer> getSelectOrderInventoryPageTotal(Integer offset, Integer pageSize,String startDate, String endDate, Order order);

    Boolean insertDelivery(@Param("delivery") Delivery delivery,@Param("number") String number,@Param("orderId") String orderId);