From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/entity/TUser.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/entity/TUser.java b/src/main/java/com/highdatas/mdm/entity/TUser.java
index 749dd83..2e3a3eb 100644
--- a/src/main/java/com/highdatas/mdm/entity/TUser.java
+++ b/src/main/java/com/highdatas/mdm/entity/TUser.java
@@ -1,11 +1,14 @@
package com.highdatas.mdm.entity;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.highdatas.mdm.pojo.MasterAuthorType;
+
import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -16,21 +19,55 @@
* @since 2019-12-31
*/
@TableName("t_user")
-public class TUser extends Model<TUser> {
+public class TUser extends Model<TUser> implements Character{
private static final long serialVersionUID = 1L;
-
+ /*
+ * 鐢ㄦ埛id
+ * */
@TableId("user_id")
private String userId;
-
+ /*
+ * 鐢ㄦ埛鍚�
+ * */
@TableField("user_name")
private String userName;
+ /*
+ * 鍒涘缓鏃堕棿
+ * */
@TableField("create_time")
private Date createTime;
-
+ /*
+ * 鏇存柊鏃堕棿
+ * */
@TableField("update_time")
private Date updateTime;
+
+ /*
+ * 瑙掕壊id鍒楄〃
+ * */
+ private List<String> roleId;
+ /*
+ * 鐢ㄦ埛缁刬d鍒楄〃
+ * */
+ private List<String> groupId;
+
+ public List<String> getRoleId() {
+ return roleId;
+ }
+
+ public void setRoleId(List<String> roleId) {
+ this.roleId = roleId;
+ }
+
+ public List<String> getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(List<String> groupId) {
+ this.groupId = groupId;
+ }
public String getUserId() {
return userId;
@@ -79,4 +116,14 @@
", updateTime=" + updateTime +
"}";
}
+
+ @Override
+ public String getId() {
+ return getUserId();
+ }
+
+ @Override
+ public MasterAuthorType getType() {
+ return MasterAuthorType.user;
+ }
}
--
Gitblit v1.8.0