From b2bc3eb81485bc7ddb8366477b3483d4f160adaa Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 三月 2024 09:17:20 +0800
Subject: [PATCH] git ch
---
server/company/src/main/java/com/doumee/api/business/MemberController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index 74eea2e..a5f8676 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -96,7 +96,7 @@
@GetMapping("/{id}")
@RequiresPermissions("business:member:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(memberService.findById(id));
+ return ApiResponse.success(memberService.findDetailById(id));
}
@@ -118,8 +118,8 @@
@ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
})
@RequiresPermissions("business:worktype:create")
- public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file) {
- return ApiResponse.success(memberService.importBatch(file));
+ public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file,Integer solutionId) {
+ return ApiResponse.success(memberService.importBatch(file,solutionId));
}
}
--
Gitblit v1.9.3