From e52bc2b90ee7bbff60e15786af1bc5578fe01b3d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 13:10:35 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/OrderService.java |    2 +-
 1 files changed, 1 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..f5b50e5 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -28,6 +28,6 @@
     /**
      * 璁㈠崟鍚堝苟棰勮
      */
-    OrderMergeVo mergePreview(List<Long> ids);
+    List<OrderMergeVo> mergePreview(List<Long> ids);
 
 }

--
Gitblit v1.9.1