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

guoyuji

2024-07-07 397d2cebd30bb499e7585ac7db4d8d6c787da257

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

@@ -42,6 +42,8 @@

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

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

    Integer getDeliveryConut(@Param("deliveryId") String deliveryId);

    Boolean updateDeliveryToExamine(@Param("deliveryId") String deliveryId,@Param("deliveryState") int deliveryState);