Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

server/svr-authentication/src/main/java/com/yihu/jw/security/service/UserService.java

@@ -37,8 +37,8 @@ public class UserService {
        userDO.setUsername(userDO.getMobile());
        userDO.setName(userDO.getMobile());
        userDO.setSalt(randomString(5));
        userDO.setEnabled(1);
        userDO.setLocked(0);
        userDO.setEnabled(true);
        userDO.setLocked(false);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();
        if (StringUtils.isEmpty(password)) {