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/service/PersonJobResponsibilitiesService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
index 2afa074..7ec0914 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.personnel.dto.PersonJobResponsibilitiesDto;
import com.ruoyi.personnel.pojo.PersonJobResponsibilities;
+import org.apache.ibatis.annotations.Param;
import javax.servlet.http.HttpServletResponse;
@@ -19,9 +20,9 @@
public interface PersonJobResponsibilitiesService extends IService<PersonJobResponsibilities> {
IPage<PersonJobResponsibilitiesDto> personJobResponsibilitiesSelect(Page page,
- String userId,
- String departmentId,
- String userName);
+ @Param("userId") Integer userId,
+ @Param("departmentId") String departmentId,
+ @Param("userName") String userName);
void exportPersonJobResponsibilities(Integer id, HttpServletResponse response);
}
--
Gitblit v1.9.3