From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/OrderService.java | 6 +++++-
1 files changed, 5 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..2418d98 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -23,11 +23,15 @@
void remove(Long orderId);
+ void report(Long orderId, Long userId);
+
List<Order> selectComplete();
/**
* 璁㈠崟鍚堝苟棰勮
*/
- OrderMergeVo mergePreview(List<Long> ids);
+ List<OrderMergeVo> mergePreview(List<Long> ids);
+
+ List<Order> selectorderNoL(String orderNo);
}
--
Gitblit v1.9.1