From c26b5587a09499797b65f353db7775a6db150ed2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 14:13:43 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 7aa69f8..ecb2180 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -80,7 +80,7 @@
         shop.setCustomOrderNumber(0);
         shopService.save(shop);
 
-        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+        LoginUser loginUserApplet = tokenService.getLoginUser();
         AppUserShop appUserShop = new AppUserShop();
         appUserShop.setAppUserId(loginUserApplet.getUserid());
         appUserShop.setShopId(shop.getId());

--
Gitblit v1.7.1