From e9f4a368fd3845a38eb54d3d18d77e96e5767b61 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 05 九月 2023 10:47:22 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/OrderService.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java index 5a0434e..6860609 100644 --- a/src/main/java/com/zy/asrs/service/OrderService.java +++ b/src/main/java/com/zy/asrs/service/OrderService.java @@ -28,6 +28,11 @@ /** * 璁㈠崟鍚堝苟棰勮 */ - OrderMergeVo mergePreview(List<Long> ids); + List<OrderMergeVo> mergePreview(List<Long> ids); + /** + * 鏌ヨ涓婃姤瀹岀粨鍘嗗彶妗� + * @return + */ + List<Order> selectToBeHistoryOrder(); } -- Gitblit v1.9.1