From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/OrderService.java | 4 ++++
1 files changed, 4 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 a5006be..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();
/**
@@ -32,4 +34,6 @@
List<Order> selectorderNoL(String orderNo);
+ List<Order> selectToBeHistoryOrder();
+
}
--
Gitblit v1.9.1