From 24dc501ed2eca9ffa890784c9028b5ac954c2faa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 11:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 7e1eb65..8d445e0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -220,8 +220,8 @@
}
@Override
- public Page<Order> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize) {
- return baseMapper.orderListWorker(userId, state, Page.of(pageNum, pageSize));
+ public Page<Order> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize) {
+ return baseMapper.orderListWorker(userId, state,searchValues, Page.of(pageNum, pageSize));
}
@Override
--
Gitblit v1.7.1