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/controller/PersonJobResponsibilitiesController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
index e9838af..1a824e1 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
@@ -44,7 +44,7 @@
@ApiOperation(value = "鏌ヨ 宀椾綅鑱岃矗")
@GetMapping("personJobResponsibilitiesSelect")
- public Result<IPage<PersonJobResponsibilitiesDto>> personJobResponsibilitiesSelect(Page page, String userId, String departmentId, String userName) {
+ public Result<IPage<PersonJobResponsibilitiesDto>> personJobResponsibilitiesSelect(Page page, Integer userId, String departmentId, String userName) {
IPage<PersonJobResponsibilitiesDto> iPage = personJobResponsibilitiesService.personJobResponsibilitiesSelect(page, userId, departmentId, userName);
return Result.success(iPage);
}
--
Gitblit v1.9.3