From 7af935e6a092193adf309f3a2d700f049b4b63d8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 14:11:49 +0800
Subject: [PATCH] 解决冲突
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
index bc9d4eb..2c251ca 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
@@ -1,6 +1,8 @@
package com.dy.pipIrrGlobal.daoRm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
+import com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -11,7 +13,7 @@
* @Description
*/
@Mapper
-public interface RmOpenCloseValveLastMapper {
+public interface RmOpenCloseValveLastMapper extends BaseMapper<RmOpenCloseValveLast> {
/**
* delete by primary key
*
@@ -63,8 +65,8 @@
/**
* select by rtuAddr
*
- * @param rtuAddr rtuAddr
+ * @param intakeId intakeId
* @return object by rtuAddr
*/
- List<RmOpenCloseValveLast> selectByRtuAddr(String rtuAddr);
+ List<RmOpenCloseValveLast> selectByIntakeId(Long intakeId);
}
\ No newline at end of file
--
Gitblit v1.8.0