From f4b840c5374dd3cd916a656396818a96d25a631b Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 10:24:58 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
index 9789d67..722b709 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -2,6 +2,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import org.apache.ibatis.annotations.Mapper;
@@ -30,7 +31,7 @@
* 寰楀埌鍏ㄩ儴瀹炰綋
* @return 鍏ㄩ儴瀹炰綋
* */
- List<PrIntake> selectAll();
+ List<VoAllIntake> selectAll();
/**
* 閫昏緫鍒犻櫎
@@ -156,7 +157,7 @@
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
* @return
*/
- List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operator") Long operator);
+ List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operatorId") Long operatorId);
/**
* 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
--
Gitblit v1.8.0