From 98de7181a8e13420734f75d2eba62f1aef298643 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 一月 2025 19:39:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 4c0fc0f..4158188 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -44,6 +44,7 @@
* @return 分页
*/
Page<Order> queryPage(OrderQueryRequest orderQueryRequest);
+ List<String> queryPage1(OrderQueryRequest orderQueryRequest);
/**
* 订单管理-订单统计
@@ -54,7 +55,7 @@
* @param page 分页
* @return 分页统计
*/
- Page<OrderCountVO> orderCount(String name, String phone, List<String> cityList, Page<OrderCountVO> page);
+ Page<OrderCountVO> orderCount(String name, String phone, List<String> cityList, Page<OrderCountVO> page,List<String> siteIds);
/**
* 订单管理分页模块，订单数量统计
--
Gitblit v1.7.1