From 691c663dc5624e0dc2115a69f380087fb9ac16a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 20:37:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 41cf35c..486420f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -285,7 +285,7 @@
}
//当前绑定门店的店铺信息
if (user.getShopId() != null) {
- R<Shop> storeById = storeClient.getStoreById(user.getShopId());
+ R<Shop> storeById = shopClient.getShopById(user.getShopId());
if (storeById.getData() != null) {
user.setShopName(storeById.getData().getName());
}
@@ -389,10 +389,10 @@
*/
@GetMapping("/getAppuserPage")
@ApiOperation(value = "用户列表", tags = {"管理后台"})
- public R<IPage<AppUser>> getAppuserPage(@ApiParam("页码") @RequestParam Integer pageCurr,
+ public R<IPage<AppUser>> getAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
@ApiParam("每一页数据大小") Integer pageSize,
AppUser appUser) {
- IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageCurr, pageSize, appUser);
+ IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser);
return R.ok(appuserPage);
}
@@ -496,7 +496,7 @@
@GetMapping("/change/shop")
@ApiOperation(value = "用户列表-更换门店", tags = {"管理后台"})
- public R<AppUser> shop(Long id, Long shopId) {
+ public R<AppUser> shop(Long id, Integer shopId) {
AppUser byId = appUserService.getById(id);
byId.setShopId(shopId);
appUserService.updateById(byId);
@@ -714,14 +714,14 @@
* @return
*/
@PostMapping("/upload")
- public R<String> upload(MultipartFile file){
+ public String upload(MultipartFile file){
String s = null;
try {
s = ObsUploadUtil.obsUpload(file);
} catch (IOException e) {
throw new RuntimeException(e);
}
- return R.ok(s);
+ return s;
}
}
--
Gitblit v1.7.1