From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 615af7b..61cca64 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
@@ -18,7 +18,7 @@
* 宀椾綅鑱岃矗 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-09 02:07:49
*/
@Api(tags = "浜哄憳 - 宀椾綅鑱岃矗")
@@ -46,7 +46,7 @@
@ApiOperation(value = "鏌ヨ 宀椾綅鑱岃矗")
@GetMapping("/personJobResponsibilitiesSelect")
- public Result<IPage<PersonJobResponsibilitiesDto>> personJobResponsibilitiesSelect(Page page, String userId, String departmentId, String userName) {
+ public Result personJobResponsibilitiesSelect(Page page, String userId, String departmentId, String userName) {
IPage<PersonJobResponsibilitiesDto> iPage = personJobResponsibilitiesService.personJobResponsibilitiesSelect(page, userId, departmentId, userName);
return Result.success(iPage);
}
--
Gitblit v1.9.3