From 68a42ee3b831e9f973c817a9792a79e5f0e4d9f3 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 03 三月 2025 09:10:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java
index f2a4e58..66e47cf 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRecordDto;
import com.ruoyi.device.pojo.DeviceRecord;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -18,7 +19,7 @@
*/
public interface DeviceRecordMapper extends BaseMapper<DeviceRecord> {
- IPage<DeviceRecordDto> deviceRecordPage(Integer deviceId, Page page, String sampleCode, String managementNumber, Integer userId);
+ IPage<DeviceRecordDto> deviceRecordPage(@Param("deviceId") Integer deviceId, @Param("page") Page page, @Param("sampleCode") String sampleCode, @Param("managementNumber") String managementNumber, @Param("userId") Integer userId);
/**
@@ -33,5 +34,5 @@
* @param exportDate
* @return
*/
- List<DeviceRecord> selectExportList(Integer deviceId, String exportDate);
+ List<DeviceRecord> selectExportList(@Param("deviceId") Integer deviceId, @Param("exportDate") String exportDate);
}
--
Gitblit v1.9.3