From 7efb5fea055cd5a95d8eb4457322adc7c417ac2a Mon Sep 17 00:00:00 2001
From: Bang Hu <hu_bang@hotmail.com>
Date: 星期四, 28 八月 2025 12:45:19 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/service/OrderInfoService.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index a7a367f..7481c6c 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -41,6 +41,11 @@
PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
/**
+ * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�
+ */
+ PageResult<OrderInfo> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
+
+ /**
* 鑾峰彇璁㈠崟璇︽儏
*/
OrderDetailVO getOrderDetail(String orderId);
--
Gitblit v1.8.0