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

puzhibing

2025-01-15 edd2c4d20cdfde142275f88b2f79ea8a8778bf78

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

@@ -175,7 +175,7 @@
            user.setObjectId(shopId);
            user.setAppUserId(appUser.getId());
            String s = MD5Generator.generateMD5(phone.substring(5));
            user.setPassword(SecurityUtils.encryptPassword(s));
            user.setPassword(s);
            user.setCreateTime(new Date());
            Long userId = sysUserClient.saveShopUser(user).getData();