From b7c4edd36912d26aa2e8e6fa5605c370bb2e478a Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期四, 13 三月 2025 09:43:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java
index d49cbd0..f143527 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.personnel.dto.PersonSupervisionRecordDto;
 import com.ruoyi.personnel.pojo.PersonSupervisionRecord;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,7 +17,7 @@
  */
 public interface PersonSupervisionRecordMapper extends BaseMapper<PersonSupervisionRecord> {
 
-    IPage<PersonSupervisionRecordDto> personSupervisionRecordPage(Page page, Integer userId, Integer departLimsId, String userName);
+    IPage<PersonSupervisionRecordDto> personSupervisionRecordPage(Page page, @Param("userId") Integer userId, @Param("departLimsId") Integer departLimsId, @Param("userName") String userName);
 
     /**
      * 鏌ヨ鐩戠潱璁板綍璇︽儏

--
Gitblit v1.9.3