Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-11-03 4df965ceb66f05f9e13d849003821e8eaac76e1f

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

@@ -15,5 +15,12 @@
    int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);

    List<Order> selectComplete();
    List<Order> selectComplete8();

    int addToLogTable(Order order);

    List<Order> selectorderNoL(@Param("orderNo")String orderNo);

    Order selectOrderMoveStatus();
    Order selectOrderMoveStatusInitial();
}