Merge branch 'four_member' into 'test'

罗元桥

2021-09-24 d091820e1068a1b7b84194aa6162b4d9e6773771

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -2564,6 +2564,20 @@
        return R.fail();
    }

    @Override
    public R resetPasswordPatch(Long[] userId) {
        if(userId!=null){
            for(Long user:userId){
                SysUserDO sysUserDO = new SysUserDO();
                sysUserDO.setUserId(user);
                String encode = new BCryptPasswordEncoder().encode("admin123456");
                sysUserDO.setPassword(encode);
                userDao.updateById(sysUserDO);
            }
        }
        return R.ok();
    }

    /**
     * 便民服务新增商家账号
     * @param convenientMerchantDTO