From f349c89f870f15c7c15dd9c463092f0544b8dca3 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 14 七月 2022 17:10:11 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/DocUserController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DocUserController.java b/src/main/java/com/whyc/controller/DocUserController.java
index cbe0028..e6deb1f 100644
--- a/src/main/java/com/whyc/controller/DocUserController.java
+++ b/src/main/java/com/whyc/controller/DocUserController.java
@@ -4,6 +4,7 @@
import com.whyc.dto.Response;
import com.whyc.pojo.DocUser;
import com.whyc.service.DocUserService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -20,15 +21,16 @@
private DocUserService service;
@ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�",notes = "榛樿鎺掗櫎鎸囧畾鐢ㄦ埛锛歴ys_admin")
- @PostMapping("getAllUser")
- private Response getAllUser(@RequestBody Page page){
- return service.getAllUser(page);
+ @GetMapping("getAllUser")
+ private Response getAllUser(@RequestParam int pageCurr,@RequestParam int pageSize){
+ return service.getAllUser(pageCurr,pageSize);
}
@ApiOperation(value = "缂栬緫鎵�鏈夌敤鎴蜂俊鎭�")
@PostMapping("updateAllUser")
@ApiImplicitParam(name = "file", value = "涓婁紶鐨勬枃浠�", dataTypeClass = MultipartFile.class, required = false,paramType = "form")
- private Response updateAllUser(@RequestPart("file") MultipartFile file,@RequestBody DocUser docUser){
+ private Response updateAllUser(@RequestPart("file") MultipartFile file, @RequestParam String json){
+ DocUser docUser= ActionUtil.getGson().fromJson(json,DocUser.class);
return service.updateAllUser(file,docUser);
}
@ApiOperation(value = "鏂版坊鍔犵敤鎴蜂俊鎭�")
--
Gitblit v1.9.1