src/main/java/com/zy/asrs/service/OrderService.java
@@ -23,11 +23,17 @@ void remove(Long orderId); void report(Long orderId, String username); List<Order> selectComplete(); /** * 订单合并预览 */ OrderMergeVo mergePreview(List<Long> ids); List<OrderMergeVo> mergePreview(List<Long> ids); List<Order> selectorderNoL(String orderNo); List<Order> selectToBeHistoryOrder(); }