Merge remote-tracking branch 'origin/phyzasrs-erp' into phyzasrs-erp

zhangchao

2024-11-02 3d321d82df16121e1c21fb2113757e5a16de54a2

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -14,7 +14,7 @@

    boolean updateSettle(Long orderId, Long settle, Long userId);

    boolean updateSettle2(Long orderId, Long settle, Integer pltType);
    boolean updateSettle2(Long orderId, Long settle, Integer pltType,String inTime);


    void checkComplete(String orderNo, Integer pltType);