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

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -359,6 +359,9 @@ public class AccountServiceImpl implements AccountService {
 
             current.setQueryIpUrlList(queryIpUrlList);
             current.setWhiteList(whiteList);
+            List<String> ownWhiteList = current.getOwnWhiteList();
+            ownWhiteList.addAll(whiteList);
+            current.setOwnWhiteList(ownWhiteList);
 
             if (account.getPromotion() != null) {
                 int invitedUsers = accountRepository.countByPromotionCodeAndParentIsNull(account.getPromotion().getCode());