商家端注册

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

@@ -363,7 +363,9 @@ public class LoginController extends BladeController {
 		if (!request.getPassword().equals(request.getRePassword())) {
 			return R.fail("密码不一致");
 		}
-		User query1 = userService.getOne(Wrappers.<User>query().lambda().eq(User::getAccount, request.getPhone()));
+		User query1 = userService.getOne(Wrappers.<User>query().lambda()
+				.eq(User::getAccount, request.getPhone())
+				.eq(User::getUserType, UserEnum.MERCHANT.getCategory()));
 		if (query1 != null){
 			return R.fail("手机号已注册！");
 		}