From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
index addf494..f9a0459 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
@@ -21,8 +21,8 @@
}
@Override
- public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status) {
- return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition, status));
+ public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, Long director, String condition, Integer status) {
+ return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId,director, condition, status));
}
@Override
--
Gitblit v1.9.1