From 40616c5802932c2216e97a44ec9abed182590bbe Mon Sep 17 00:00:00 2001
From: seatonwan9
Date: 星期四, 28 八月 2025 15:46:40 +0800
Subject: [PATCH] 更新代码

---
 src/main/java/com/webmanage/service/OrderInfoService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index a7a367f..07ff911 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -38,7 +38,12 @@
     /**
      * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛�
      */
-    PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+    PageResult<OrderDetailVO> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+
+    /**
+     * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�
+     */
+    PageResult<OrderInfo> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
 
     /**
      * 鑾峰彇璁㈠崟璇︽儏

--
Gitblit v1.8.0