Merge remote-tracking branch 'origin/master'

xuhy

7 天以前 1d6f916b5254a31a086f897acb0d4a5913a3e332

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSalespersonServiceImpl.java

@@ -86,7 +86,9 @@
            user.setPhonenumber(dto.getPhone());
            user.setUserName(dto.getPhone());
            user.setNickName(dto.getSalespersonName());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            if(StringUtils.isNotEmpty(dto.getPassword())){
                user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            }
            sysUserService.updateUser(user);
        }
        return R.ok();