From 89034b8a149e156703bbc8c49671d747cf2298a2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 20:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/java/com/zy/asrs/service/OrderService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index f5b50e5..645a580 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/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();
+
}
--
Gitblit v1.9.1