Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs-erp

whycq

2024-09-04 41326b3129ae3e4ef7a45bc16dba64dc9dd27404

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

}