From 3b054d0694de1a04c111f7adef089f264143cc8c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 11:52:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
index f5064af..0fa5997 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
@@ -31,7 +31,7 @@
* @param orderPageList
* @return
*/
- List<OrderPageListVo> getOrderPageList(PageInfo<OrderPageListVo> pageInfo, @Param("item") OrderPageList orderPageList);
+ List<OrderManagePageListVO> getOrderPageList(PageInfo<OrderManagePageListVO> pageInfo, @Param("item") OrderPageList orderPageList);
OrderStatistics getOrderStatistics(@Param("startTime")String startTime,
@Param("endTime") String endTime, @Param("shopId") Integer shopId);
@@ -61,5 +61,5 @@
- List<OrderStatisticsDetail> getOrderListGroupByDate(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
+ List<OrderStatisticsDetail> getOrderListGroupByDate(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime,@Param("shopId")Integer shopId);
}
--
Gitblit v1.7.1