Commit f11be822 authored by huangjiamin's avatar huangjiamin

Merge remote-tracking branch 'remotes/origin/feature-secondaryProxyPort' into staging

parents be8958ae 31eedd0c
......@@ -359,9 +359,6 @@ public class AccountServiceImpl implements AccountService {
current.setQueryIpUrlList(queryIpUrlList);
current.setWhiteList(whiteList);
List<String> ownWhiteList = current.getOwnWhiteList();
ownWhiteList.addAll(whiteList);
current.setOwnWhiteList(ownWhiteList.stream().distinct().collect(Collectors.toList()));
if (account.getPromotion() != null) {
int invitedUsers = accountRepository.countByPromotionCodeAndParentIsNull(account.getPromotion().getCode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment