From 217e39bec2ae2a861c4619d277ab0bc823cf85d4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 11:41:35 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
index 046cf24..46e3fab 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
@@ -6,6 +6,7 @@
import com.ruoyi.personnel.dto.PersonTrainingDto;
import com.ruoyi.personnel.pojo.PersonTraining;
import com.ruoyi.personnel.pojo.PersonTrainingDetailed;
+import org.apache.ibatis.annotations.Param;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -22,7 +23,7 @@
public interface PersonTrainingService extends IService<PersonTraining> {
IPage<PersonTrainingDto> personTrainingSelect(Page page,
- String compilerName, String departmentId);
+ @Param("compilerName") String compilerName, @Param("departmentId") String departmentId);
void personTrainingImport(MultipartFile file, PersonTraining training);
--
Gitblit v1.9.3