Commit f99c8f48 authored by huangjiamin's avatar huangjiamin

新增ownWhitelist

parent 212fe709
...@@ -60,6 +60,10 @@ public class AccountDto { ...@@ -60,6 +60,10 @@ public class AccountDto {
} }
/**
* 测试合并分支
* @param account
*/
public AccountDto(Account account) { public AccountDto(Account account) {
this.setName(account.getName()); this.setName(account.getName());
this.setAllowedToCreateSubUser(account.isAllowedToCreateSubUser()); this.setAllowedToCreateSubUser(account.isAllowedToCreateSubUser());
......
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