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

liujie

6 天以前 5b883298571421132edf68cab7a22ab16a1f0a6b

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