Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

无关风月

2025-01-14 fc3c206439297fedc116e5a05aff799529e93e99

 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();