Merge remote-tracking branch 'origin/master'

ZengTao

5 天以前 994b07344c976abcb33ff5eaecd685f6461be5ea

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java

@@ -70,7 +70,7 @@

    @Resource
    BCryptPasswordEncoder passwordEncoder;
    @Autowired
    @Resource
    private SysUserRoleMapper sysUserRoleMapper;

    @Override
@@ -108,7 +108,7 @@
    public String saveUser(SysUserVO user) {
        log.info("保存用户信息");
        // 默认密码
        String password = passwordEncoder.encode(Const.DEFULT_PASSWORD);
        String password = passwordEncoder.encode(user.getPassword());
        user.setPassword(password);
        SysUser sysUser = new SysUser();
        BeanUtils.copyProperties(user, sysUser);