From 3b92cf3f9cd038c446e390aab18e759b0463d24a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 13 三月 2025 09:08:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
index 015621a..34eee58 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
@@ -63,7 +63,7 @@
@ApiOperation(value = "浜哄憳鏄庣粏鍒嗛〉鏌ヨ")
@GetMapping("basicInformationOfPersonnelSelectPage")
- public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page<List<PersonBasicInfoDetailsDto>> page, String name, Integer departmentId) {
+ public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page page, String name, Integer departmentId) {
return Result.success(personBasicInfoService.basicInformationOfPersonnelSelectPage(page, name, departmentId));
}
--
Gitblit v1.9.3