From fc3c206439297fedc116e5a05aff799529e93e99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 19:58:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 d564c72..38a827d 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
@@ -328,6 +328,8 @@
                 userShop.setShopId(shop.getId());
                 userShop.setRoleType(1);
                 userShop.setRoleId(2L);
+                userShop.setNickName(sysUser.getNickName());
+                userShop.setCreateTime(LocalDateTime.now());
                 userShopClient.saveUserShop(userShop);
             }
         }else{
@@ -352,6 +354,8 @@
             userShop.setShopId(shop.getId());
             userShop.setRoleType(1);
             userShop.setRoleId(2L);
+            userShop.setNickName(appUser.getName());
+            userShop.setCreateTime(LocalDateTime.now());
             userShopClient.saveUserShop(userShop);
         }
         return R.ok();

--
Gitblit v1.7.1