From 866f686c3c4ae1bd47affe146a26db5dd1ceb032 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 14:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java       |   10 ++++++++++
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserChangeLogController.java |    2 ++
 2 files changed, 12 insertions(+), 0 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 3d0b39f..7479972 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
@@ -503,6 +503,16 @@
 		appUserService.updateById(byId);
 		return R.ok();
 	}
+	@GetMapping("/change/shop")
+	@ApiOperation(value = "用户列表-更换门店", tags = {"管理后台"})
+	public R<AppUser> shop(Long id,Long shopId)
+	{
+		AppUser byId = appUserService.getById(id);
+		byId.setShopId(shopId);
+		appUserService.updateById(byId);
+		return R.ok();
+	}
+
 
 	public  Long getTop(Long inviteId){
 		AppUser byId = appUserService.getById(inviteId);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserChangeLogController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserChangeLogController.java
index 140f7d6..0657a24 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserChangeLogController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserChangeLogController.java
@@ -7,6 +7,7 @@
 import com.ruoyi.account.dto.UserChangeQuery;
 import com.ruoyi.account.service.UserChangeLogService;
 import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,6 +43,7 @@
 	}
 
 	@PostMapping("/page")
+	@ApiOperation(value = "会员变更记录", tags = {"后台"})
 	public R<IPage<UserChangeLog>> page(@RequestBody UserChangeQuery userChangeLog){
 
 		return R.ok(userChangeLogService.pageList(userChangeLog));

--
Gitblit v1.7.1