Commit 5959bee7 authored by renjie's avatar renjie

推广码

parent c7735370
...@@ -47,6 +47,8 @@ public class AccountDto { ...@@ -47,6 +47,8 @@ public class AccountDto {
private List<String> queryIpUrlList; private List<String> queryIpUrlList;
private Promotion promotion;
public AccountDto(){ public AccountDto(){
} }
...@@ -63,6 +65,8 @@ public class AccountDto { ...@@ -63,6 +65,8 @@ public class AccountDto {
this.setPermission(account.getPermission()); this.setPermission(account.getPermission());
this.setWhiteList(account.getWhiteList()); this.setWhiteList(account.getWhiteList());
this.setQueryIpUrlList(account.getQueryIpUrlList()); this.setQueryIpUrlList(account.getQueryIpUrlList());
if (account.getPromotion() != null)
this.setPromotion(account.getPromotion());
} }
public boolean isPrePaid() { public boolean isPrePaid() {
...@@ -217,4 +221,12 @@ public class AccountDto { ...@@ -217,4 +221,12 @@ public class AccountDto {
public void setQueryIpUrlList(List<String> queryIpUrlList) { public void setQueryIpUrlList(List<String> queryIpUrlList) {
this.queryIpUrlList = queryIpUrlList; this.queryIpUrlList = queryIpUrlList;
} }
public Promotion getPromotion() {
return promotion;
}
public void setPromotion(Promotion promotion) {
this.promotion = promotion;
}
} }
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