Merge remote-tracking branch 'origin/master'

“mitao”

2025-12-26 0bb25fa56addc31b20ce20fba84868c2870f1fc3

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java

@@ -126,6 +126,7 @@
        user.setPassword(company.getPassword());
        user.setPhonenumber(company.getChargePersonPhone());
        user.setNickName(company.getChargePerson());
        user.setCode(company.getCode());
        user.setRoleId(2l);
        if (!userService.checkUserNameUnique(user)) {
            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -267,6 +268,8 @@
        {
            return R.fail("新增用户'" + user.getUserName() + "'失败，推广号已存在");
        }


        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));