From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
index dc45a5a..6817a86 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
@@ -17,12 +17,12 @@
@Override
- public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId) {
- return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit,userId);
+ public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId,String custName) {
+ return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit,userId,custName);
}
@Override
- public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId) {
- return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit,userId);
+ public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId,String custName) {
+ return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit,userId,custName);
}
}
--
Gitblit v1.9.1