From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
index 3090f2d..ee98076 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
@@ -107,13 +107,13 @@
phone = phone.replaceAll(" ", "");
// 鍒ゆ柇鎵嬫満鍙风爜鏄惁琚皝绂�
- ForbiddenUserIdentifyCode identifyCode1 = forbiddenUserIdentifyCodeService
- .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, phone);
- if (identifyCode1 != null && identifyCode1.getEffective() != null && identifyCode1.getEffective()) {
- out.print(JsonUtil.loadFalseResult(9001,"璇ョ數璇濆彿鐮佽鍗犵敤"));
- return;
- }
-
+// ForbiddenUserIdentifyCode identifyCode1 = forbiddenUserIdentifyCodeService
+// .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, phone);
+// if (identifyCode1 != null && identifyCode1.getEffective() != null && identifyCode1.getEffective()) {
+// out.print(JsonUtil.loadFalseResult(9001,"璇ョ數璇濆彿鐮佽鍗犵敤"));
+// return;
+// }
+//
// 鍒ゆ柇鎵嬫満鍙风爜鏄惁琚皝绂�
UserInfo phoneUser = userInfoService.getEffectiveUserInfoByPhone(phone);
if (phoneUser != null) {
--
Gitblit v1.8.0