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-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