From 18a8ae526fa307414267e46961ba058adba57231 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Dec 2021 17:25:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
---
src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java | 4 ++--
src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java b/src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java
index c2d6a1f..0955ece 100644
--- a/src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java
+++ b/src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java
@@ -18,8 +18,8 @@
@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")
diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
index e22c559..5b0b4be 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
@@ -43,12 +43,12 @@
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());
--
Gitblit v1.9.1