From 526ce12364b7f708ba4e59d3588386c70c83930d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 17 十二月 2024 08:58:06 +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 7f1a229..d50e077 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;
@@ -24,13 +25,13 @@
      * @param id primary key
      * @return object by primary key
      */
-    PrIntake selectByPrimaryKey(Long id);
+    VoAllIntake selectByPrimaryKey(Long id);
 
     /**
      * 寰楀埌鍏ㄩ儴瀹炰綋
      * @return 鍏ㄩ儴瀹炰綋
      * */
-    List<PrIntake> selectAll();
+    List<VoAllIntake> selectAll();
 
     /**
      * 閫昏緫鍒犻櫎

--
Gitblit v1.8.0