From 217e39bec2ae2a861c4619d277ab0bc823cf85d4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 11:41:35 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 01b44d4..979c1cb 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
@@ -74,7 +74,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));
}
@@ -83,7 +83,7 @@
@PostMapping("/saveCNASFile")
public Result saveFile(@RequestPart("file") MultipartFile file) {
String s = FileSaveUtil.uploadWordFile(file);
- return Result.success("涓婁紶鎴愬姛", s);
+ return Result.success(s, "涓婁紶鎴愬姛");
}
@GetMapping("/getAnnexByUserId")
@@ -176,7 +176,7 @@
* @return
*/
@ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒犻櫎")
- @GetMapping("/delBasicInfoFileList")
+ @DeleteMapping("/delBasicInfoFileList")
public Result delBasicInfoFileList(Integer basicInfoFileId){
return Result.success(personBasicInfoFileService.removeById(basicInfoFileId));
}
@@ -212,7 +212,7 @@
* @return
*/
@ApiOperation(value = "浜哄憳宸ヤ綔缁忓巻鍒犻櫎")
- @GetMapping("/delBasicInfoWorkList")
+ @DeleteMapping("/delBasicInfoWorkList")
public Result delBasicInfoWorkList(Integer basicInfoWorkId){
return Result.success(personBasicInfoWorkService.removeById(basicInfoWorkId));
}
--
Gitblit v1.9.3