From d5bcb7deecd599a752d62333b8dc976228498b55 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 18 七月 2022 10:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/DocUserController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DocUserController.java b/src/main/java/com/whyc/controller/DocUserController.java
index c75fac8..bee0cd1 100644
--- a/src/main/java/com/whyc/controller/DocUserController.java
+++ b/src/main/java/com/whyc/controller/DocUserController.java
@@ -22,27 +22,27 @@
@ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�",notes = "榛樿鎺掗櫎鎸囧畾鐢ㄦ埛锛歴ys_admin")
@GetMapping("getAllUser")
- private Response getAllUser(@RequestParam int pageCurr,@RequestParam int pageSize){
- return service.getAllUser(pageCurr,pageSize);
+ private Response getAllUser(@RequestBody DocUser docUser,@RequestParam int pageCurr,@RequestParam int pageSize){
+ return service.getAllUser(docUser,pageCurr,pageSize);
}
@ApiOperation(value = "缂栬緫鎵�鏈夌敤鎴蜂俊鎭�")
@PostMapping("updateUser")
@ApiImplicitParam(name = "file", value = "涓婁紶鐨勬枃浠�", dataTypeClass = MultipartFile.class, required = false,paramType = "form")
- private Response updateUser(@RequestPart("file") MultipartFile file, @RequestParam String json){
+ private Response updateUser(@RequestPart(value = "file",required = false) MultipartFile file, @RequestParam String json){
DocUser docUser= ActionUtil.getGson().fromJson(json,DocUser.class);
return service.updateUser(file,docUser);
}
@ApiOperation(value = "鏂版坊鍔犵敤鎴蜂俊鎭�")
@PostMapping("addUser")
@ApiImplicitParam(name = "file", value = "涓婁紶鐨勬枃浠�", dataTypeClass = MultipartFile.class, required = false,paramType = "form")
- private Response addUser(@RequestPart("file") MultipartFile file,@RequestParam String json){
+ private Response addUser(@RequestPart(value = "file",required = false) MultipartFile file,@RequestParam String json){
DocUser docUser= ActionUtil.getGson().fromJson(json,DocUser.class);
return service.addUser(file,docUser);
}
@ApiOperation(value = "鍒犻櫎鐢ㄦ埛淇℃伅")
- @PostMapping("delUser")
- private Response delUser(@RequestParam int Id){
- return service.delUser(Id);
+ @PostMapping("deleteUser")
+ private Response delUser(@RequestParam int id){
+ return service.delUser(id);
}
}
--
Gitblit v1.9.1