Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
| | |
| | | @ApiModelProperty(value = "密码", example = "123456") |
| | | private String password; |
| | | |
| | | @ApiModelProperty(value = "类型 1-手机号 2-邮箱", example = "1") |
| | | private String type = "1"; |
| | | // @ApiModelProperty(value = "类型 1-手机号 2-邮箱", example = "1") |
| | | // private String type = "1"; |
| | | |
| | | // @NotBlank(message = "验证码不能为空") |
| | | // @ApiModelProperty(value = "验证码", example = "123456") |
| | |
| | | videoMember = new VideoMemberEntity(); |
| | | videoMember.setPassword(SecureUtil.md5(registerDto.getPassword())); |
| | | |
| | | // 判断账号类型 |
| | | if (AppContants.ACCOUNT_TYPE_MOBILE.equals(registerDto.getType())) { |
| | | videoMember.setPhone(registerDto.getAccount()); |
| | | } else { |
| | | videoMember.setEmail(registerDto.getAccount()); |
| | | } |
| | | // // 判断账号类型 |
| | | // if (AppContants.ACCOUNT_TYPE_MOBILE.equals(registerDto.getType())) { |
| | | // videoMember.setPhone(registerDto.getAccount()); |
| | | // } else { |
| | | // videoMember.setEmail(registerDto.getAccount()); |
| | | // } |
| | | |
| | | videoMember.setAccount(registerDto.getAccount()); |
| | | videoMember.setName(registerDto.getAccount()); |