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

zc

2024-09-03 f392d5e620f5c182281e7b8f3166d4a6a93d3090

 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();
}