From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
index 1319c16..0298700 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
@@ -20,12 +20,12 @@
public interface PersonTrainingDetailedMapper extends MyBaseMapper<PersonTrainingDetailed> {
IPage<PersonTrainingDetailedDto> queryTheAnnualPlanDetailsTable(Page page,
- String trainingLecturerName,
- String courseCode, String trainingDate,
- Integer id,
- Integer userId,
- Integer loginUserId,
- Integer state);
+ @Param("trainingLecturerName") String trainingLecturerName,
+ @Param("courseCode") String courseCode, @Param("trainingDate") String trainingDate,
+ @Param("id") Integer id,
+ @Param("userId") Integer userId,
+ @Param("loginUserId") Integer loginUserId,
+ @Param("state") Integer state);
/**
* 鏍规嵁涓昏〃id鏌ヨ璇︽儏
--
Gitblit v1.9.3