From 6123513b72ca0e683fed9be9819cfcdfa6696882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sun, 22 Sep 2024 23:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=95=86=E6=88=B7ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/system/controller/UserController.java       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
index 6b0af41..6d6bbe9 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
@@ -412,4 +412,14 @@ public class UserController extends BaseController {
       return success("统计成功",totalBalance);
     }
 
+    @PreAuthorize("hasAuthority('sys:auth:user')")
+    @PutMapping("/updateUserMerchantId")
+    @ApiOperation("更新商户ID")
+    public ApiResult<?> updateUserMerchantId(@RequestBody User user){
+      if (userService.updateUser(user)) {
+        return success("更新成功");
+      }
+      return fail("更新失败");
+    }
+
 }