Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 694920de674526cf13afacac9f5e801e12473d41

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java

@@ -177,7 +177,7 @@
            userShop.setShopId(shopId);
            userShop.setRoleType(1);
            userShop.setRoleId(2L);
            userShop.setNickName(sysUser.getNickName());
            userShop.setNickName(user.getNickName());
            userShop.setCreateTime(LocalDateTime.now());
            userShopClient.saveUserShop(userShop);
        }