Merge branch 'dev' of shikejing/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -86,7 +86,11 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    public UserDO registerWithIdcard(UserDO userDO) {
        userDO.setSalt(randomString(5));
        userDO.setEnabled(true);
        if (StringUtils.isEmpty(userDO.getEnabled())){
            userDO.setEnabled(true);
        }else {
            userDO.setEnabled(userDO.getEnabled());
        }
        userDO.setLocked(false);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();