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/mapper/ManPakOutMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java b/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
index d38427a..c2172ba 100644
--- a/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
@@ -16,7 +16,7 @@
- List<PakOutDTO> selectPakOut(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime, @Param("curr") Integer curr, @Param("limit") Integer limit, @Param("userId") Long userId);
+ List<PakOutDTO> selectPakOut(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime, @Param("curr") Integer curr, @Param("limit") Integer limit, @Param("userId") Long userId, @Param("custName") String custName);
- int selectPakOutCount(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime,@Param("curr") Integer curr,@Param("limit") Integer limit, @Param("userId") Long userId);
+ int selectPakOutCount(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime,@Param("curr") Integer curr,@Param("limit") Integer limit, @Param("userId") Long userId, @Param("custName") String custName);
}
--
Gitblit v1.9.1