|
@@ -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();
|