@@ -0,0 +1,2140 @@
+/**%0A * %0A */%0Apackage cn.com.grocery.vo;%0A%0Aimport com.alibaba.fastjson.annotation.JSONField;%0A%0Aimport cn.com.grocery.domain.AdminUser;%0A%0A/**%0A * @author karl%0A *%0A */%0Apublic class AdminUserVO2 %7B%0A%0A%09private Long id;%0A%0A%09@JSONField(name = %22user_name%22)%0A%09private String userName;%0A%0A%09@JSONField(name = %22display_name%22)%0A%09private String displayName;%0A%0A%09@JSONField(name = %22group_id%22)%0A%09private Long groupId;%0A%0A%09private String password;%0A%0A%09private String email;%0A%0A%09private String phone;%0A%0A%09private String country;%0A%0A%09@JSONField(name = %22group_name%22)%0A%09private String groupName;%0A%0A%09@JSONField(name = %22group_type%22)%0A%09private int groupType;%0A%0A%09public Long getId() %7B%0A%09%09return id;%0A%09%7D%0A%0A%09public void setId(Long id) %7B%0A%09%09this.id = id;%0A%09%7D%0A%0A%09public String getUserName() %7B%0A%09%09return userName;%0A%09%7D%0A%0A%09public void setUserName(String userName) %7B%0A%09%09this.userName = userName;%0A%09%7D%0A%0A%09public String getDisplayName() %7B%0A%09%09return displayName;%0A%09%7D%0A%0A%09public void setDisplayName(String displayName) %7B%0A%09%09this.displayName = displayName;%0A%09%7D%0A%0A%09public Long getGroupId() %7B%0A%09%09return groupId;%0A%09%7D%0A%0A%09public void setGroupId(Long groupId) %7B%0A%09%09this.groupId = groupId;%0A%09%7D%0A%0A%09public String getPassword() %7B%0A%09%09return password;%0A%09%7D%0A%0A%09public void setPassword(String password) %7B%0A%09%09this.password = password;%0A%09%7D%0A%0A%09public String getEmail() %7B%0A%09%09return email;%0A%09%7D%0A%0A%09public void setEmail(String email) %7B%0A%09%09this.email = email;%0A%09%7D%0A%0A%09public String getPhone() %7B%0A%09%09return phone;%0A%09%7D%0A%0A%09public void setPhone(String phone) %7B%0A%09%09this.phone = phone;%0A%09%7D%0A%0A%09public String getCountry() %7B%0A%09%09return country;%0A%09%7D%0A%0A%09public void setCountry(String country) %7B%0A%09%09this.country = country;%0A%09%7D%0A%0A%09public String getGroupName() %7B%0A%09%09return groupName;%0A%09%7D%0A%0A%09public void setGroupName(String groupName) %7B%0A%09%09this.groupName = groupName;%0A%09%7D%0A%0A%09public int getGroupType() %7B%0A%09%09return groupType;%0A%09%7D%0A%0A%09public void setGroupType(int groupType) %7B%0A%09%09this.groupType = groupType;%0A%09%7D%0A%0A%09public void initFromUser(AdminUser user) %7B%0A%09%09this.id = user.getId();%0A%09%09this.groupId = user.getGroupId();%0A%09%09userName = user.getUserName();%0A%09%09displayName = user.getDisplayName();%0A%09%09password = user.getPassword();%0A%09%09email = user.getEmail();%0A%09%09phone = user.getPhone();%0A%09%09country = user.getCountry();%0A%09%7D%0A%0A%7D%0A

test rebase commit