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/RmOnHourReportLastMapper.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java
index 82153f3..d02ab16 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java
@@ -1,6 +1,8 @@
package com.dy.pipIrrGlobal.daoRm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmOnHourReportLast;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -11,7 +13,7 @@
* @Description
*/
@Mapper
-public interface RmOnHourReportLastMapper {
+public interface RmOnHourReportLastMapper extends BaseMapper<RmOnHourReportLast> {
/**
* delete by primary key
* @param id primaryKey
@@ -58,8 +60,8 @@
/**
* 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- List<RmOnHourReportLast> getRmOnHourReportLast(String rtuAddr);
+ List<RmOnHourReportLast> getRmOnHourReportLast(Long intakeId);
}
\ No newline at end of file
--
Gitblit v1.8.0