From dca29f9f05327e6a491acd62e8e5d6865ebca443 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 14 May 2019 16:54:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E4=BF=AE=E6=94=B9]:warnin?= =?UTF-8?q?g=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/MallUserInfo.java | 163 +----------------- 1 file changed, 4 insertions(+), 159 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index be6ea7887..3655934cb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -4,18 +4,21 @@ import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumUserWechat; import com.iformall.utils.Constant; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.apache.commons.lang3.StringUtils; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @Table(name = "mall_user_info") @Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class MallUserInfo extends BaseEntity { @Id @@ -40,28 +43,20 @@ public class MallUserInfo extends BaseEntity { return super.getSortColumns(); } - /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**登录用户名**/ @io.swagger.annotations.ApiModelProperty(value="登录用户名",name="username") private String username; - /**用户名称**/ @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") private String name; - /**密码**/ @io.swagger.annotations.ApiModelProperty(value="密码",name="password") private String password; - /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /**最后登录时间**/ @io.swagger.annotations.ApiModelProperty(value="最后登录时间",name="lastLoginTime") private Date lastLoginTime; - /**1:有效,0:禁止登录**/ @io.swagger.annotations.ApiModelProperty(value="1:有效,0:禁止登录",name="status") private Integer status; - /**0 不是超管 1是超管**/ @io.swagger.annotations.ApiModelProperty(value="0 不是超管 1是超管",name="isAdmin") private Integer isAdmin; @io.swagger.annotations.ApiModelProperty(value="昵称",name="nickName") @@ -105,129 +100,7 @@ public class MallUserInfo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") private String email; - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getFlowPermission() { - return flowPermission; - } - - public void setFlowPermission(String flowPermission) { - this.flowPermission = flowPermission; - } - - public String getMenus() { - return menus; - } - - public void setMenus(String menus) { - this.menus = menus; - } - - public String getRoleName() { - return roleName; - } - - public void setRoleName(String roleName) { - this.roleName = roleName; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getUsername() { - return username; - } - public void setUsername(String _username) { - username = _username; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getPassword() { - return password; - } - public void setPassword(String _password) { - password = _password; - } - public Date getCreateTime() { - return createTime; - } - public void setCreateTime(Date _createTime) { - createTime = _createTime; - } - public Date getLastLoginTime() { - return lastLoginTime; - } - public void setLastLoginTime(Date _lastLoginTime) { - lastLoginTime = _lastLoginTime; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Integer getIsAdmin() { - return isAdmin; - } - public void setIsAdmin(Integer _isAdmin) { - isAdmin = _isAdmin; - } - public List getRole() { - return role; - } - public void setRole(List role) { - this.role = role; - } - - public List getPermission() { - return permission; - } - - public void setPermission(List permission) { - this.permission = permission; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public Long getRoleId() { - return roleId; - } - - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - public String getCaptcha() { - return captcha; - } - - public void setCaptcha(String captcha) { - this.captcha = captcha; - } - - public Integer getWithWechat() { - return this.withWechat; - } public Integer getWithWechatFormat() { if(StringUtils.isNotBlank(this.webOpenId)) { @@ -238,34 +111,6 @@ public class MallUserInfo extends BaseEntity { return this.withWechat; } - public void setWithWechat(Integer withWechat) { - this.withWechat = withWechat; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getBopenId() { - return bopenId; - } - - public void setBopenId(String bopenId) { - this.bopenId = bopenId; - } - - public String getWebOpenId() { - return webOpenId; - } - - public void setWebOpenId(String webOpenId) { - this.webOpenId = webOpenId; - } - public void protectInfos() { if(StringUtils.isNotBlank(this.password)) { setPassword("保密");