获取用户信息bug

src/main/java/org/springblade/modules/api/controller/LoginController.java

@@ -67,7 +67,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.Objects;
 
 import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 import static org.springblade.modules.resource.utils.SmsUtil.VALIDATE_FAIL;
@@ -312,7 +311,8 @@ public class LoginController extends BladeController {
 		if (StringUtil.isEmpty(captchaCode) ||StringUtil.isEmpty(captchaId)){
 			return R.fail("请输入手机验证码！");
 		}
-		User user = userService.userByAccount(tenantId, username);
+		//User user = userService.userByAccount(tenantId, username);
+		User user = userService.getByAccountAndType(username,UserEnum.MERCHANT.getCategory());
 		if (user == null){
 			return R.fail("该手机号为注册！");
 		}