Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

tzsk

2024-04-25 60d14252f4951b1229e5699a0aa3c993f4ad173d

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

@@ -23,6 +23,8 @@

    void remove(Long orderId);

    void report(Long orderId, String username);

    List<Order> selectComplete();

    /**
@@ -30,4 +32,8 @@
     */
    List<OrderMergeVo> mergePreview(List<Long> ids);

    List<Order> selectorderNoL(String orderNo);

    List<Order> selectToBeHistoryOrder();

}