From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/common/AdminUser.java | 68 +++++++++++++---------------------
1 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/common/AdminUser.java b/fanli/src/main/java/com/yeshi/fanli/entity/common/AdminUser.java
index 445b588..7d1bb75 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/common/AdminUser.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/common/AdminUser.java
@@ -2,54 +2,39 @@
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
-@Entity
-@Table(name = "`yeshi_ec_adminuser`")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_adminuser")
+@Table("yeshi_ec_adminuser")
public class AdminUser implements Serializable{
/**
*
*/
private static final long serialVersionUID = 1L;
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "id")
@Column(name = "id")
private Long id;
- @org.yeshi.utils.mybatis.Column(name = "name")
- @Column(name = "name", length = 32)
@Expose
+ @Column(name = "name")
private String name;
- @org.yeshi.utils.mybatis.Column(name = "account")
- @Column(name = "account", length = 50)
+ @Column(name = "account")
private String account;
- @org.yeshi.utils.mybatis.Column(name = "pwd")
- @Column(name = "pwd", length = 50)
+ @Column(name = "pwd")
private String pwd;
- @org.yeshi.utils.mybatis.Column(name = "createtime")
- @Column(name = "createtime", length = 16)
+ @Column(name = "createtime")
private String createtime;
- @org.yeshi.utils.mybatis.Column(name = "authority")
- @Column(name = "authority", length = 1)
+ @Column(name = "authority")
private Integer authority;// 0-瓒呯骇鏉冮檺 1-鏅拷?鏉冮檺
// 閭
- @org.yeshi.utils.mybatis.Column(name = "email")
- @Column(name = "email", length = 30)
+ @Column(name = "email")
private String email;
@@ -57,24 +42,6 @@
public AdminUser(Long id){
this.id=id;
- }
-
-
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public int getAuthority() {
- return authority;
- }
-
- public void setAuthority(int authority) {
- this.authority = authority;
}
public Long getId() {
@@ -116,4 +83,21 @@
public void setCreatetime(String createtime) {
this.createtime = createtime;
}
+
+ public Integer getAuthority() {
+ return authority;
+ }
+
+ public void setAuthority(Integer authority) {
+ this.authority = authority;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
}
--
Gitblit v1.8.0