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

lty

4 天以前 c6e32e5da5d30ce2f74f0e32c3290d421c0951f2

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

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

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

    List<Order> selectComplete10();
    List<Order> selectComplete9();
    int addToLogTable(Order order);

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

    Order selectOrderMoveStatus();
    Order selectOrderMoveStatusInitial();

    List<String> AllStatusSatisfyOrder(@Param("moveStatus") Integer moveStatus);

    boolean updateOrderStatus(@Param("orderNo")String orderNo);
}