From b9f91c347781ba8fffd778165415c517332b4313 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 11 三月 2025 13:54:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_cr' into dev
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 ec9b3d0..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));
}
@@ -71,8 +71,8 @@
@ApiOperation(value = "涓婁紶鏂囦欢鎺ュ彛")
@PostMapping("/saveCNASFile")
public Result saveFile(@RequestPart("file") MultipartFile file) {
- String s = FileSaveUtil.StoreFile(file);
- return Result.success("涓婁紶鎴愬姛", s);
+ String s = FileSaveUtil.uploadWordFile(file);
+ return Result.success(s);
}
/**
--
Gitblit v1.9.3