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

puzhibing

2025-01-15 edd2c4d20cdfde142275f88b2f79ea8a8778bf78

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

@@ -503,7 +503,8 @@
            userShop.setRoleType(1);
            List<UserShop> data = userShopClient.getUserShop(userShop).getData();
            SysUser userData = sysUserClient.getSysUser(data.get(0).getUserId()).getData();
            userData.setPassword(userData.getPhonenumber().substring(5));
            String s = MD5Generator.generateMD5(userData.getPhonenumber().substring(5));
            userData.setPassword(SecurityUtils.encryptPassword(s));
            sysUserClient.resetPassword(userData);
        }
        return R.ok();