Merge branch 'refs/heads/phyzwms2' into phyzasrs-erp

whycq

2024-11-19 df1126c300d0f6a51ed573a497e52f08dbeb0d5d

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -15,7 +15,7 @@

    int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);

    int updateSettle2(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("plt")Integer plt);
    int updateSettle2(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("plt")Integer plt,@Param("inTime")String inTime);

    List<Order> selectComplete();