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-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index 82d037b..97843f9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -166,7 +166,6 @@
* @return 鎵�鏈夊彇姘村彛闆嗗悎
*/
public QueryResultVo<List<VoAllIntake>> selectAll() {
-
QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
rsVo.obj = this.prIntakeMapper.selectAll();
return rsVo;
@@ -178,7 +177,7 @@
* @param id 鍙栨按鍙D
* @return 鍙栨按鍙ｅ疄浣�
*/
- public PrIntake selectById(Long id) {
+ public VoAllIntake selectById(Long id) {
return this.prIntakeMapper.selectByPrimaryKey(id);
}
--
Gitblit v1.8.0