From 298285bf63c0cec97fab0c64df4c010c5d2aebe6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 31 五月 2023 12:47:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test

---
 src/main/java/com/zy/asrs/service/OrderService.java |    2 ++
 1 files changed, 2 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 4d3da31..50afa6b 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -31,4 +31,6 @@
     List<Order> selectInOrOutOrders(boolean inOrders);
 
     void checkSettleUpdate(Long orderId);
+
+    List<Order> selectToBeHistoryOrder(boolean isERP);
 }

--
Gitblit v1.9.1