guozhaoshun 6 years ago
parent
commit
f0cad80e7e

+ 2 - 2
rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -75,10 +75,10 @@ public class UserService {
         }
 
 
-        if(StringUtils.isNotBlank(merchant) && !merchant.equals(userVo.getMerchantSimple())){
+/*        if(StringUtils.isNotBlank(merchant) && !merchant.equals(userVo.getMerchantSimple())){
             log.error("渠道校验错误, requestMerchant={}, userMerchant={}", merchant, userVo.getMerchantSimple());
             return APIResult.error(ApiWebCode.LOGIN_ERROR);
-        }
+        }*/
 
         String userId = userVo.getId();
         String ip = loginInfoDTO.getIp();