From 84d74096a72578a83d9f3b48afa8c39b4ba0ae9a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 11:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/OrderService.java | 3 +++
1 files changed, 3 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 52e0487..ae33263 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service;
+import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.*;
import com.baomidou.mybatisplus.service.IService;
@@ -32,4 +33,6 @@
List<Order> selectToBeHistoryOrder(boolean isERP);
List<OrderListDTO> selectAllorderNo();
+
+ Page<Order> getOrderAll(Page<Order> page);
}
--
Gitblit v1.9.1