From 4edd63bcd21b999e0782047ca0602f9e915cd94c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 11 Mar 2021 08:23:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/entity/User.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/User.java b/screen-api/src/main/java/com/moral/api/entity/User.java
index 9e744ab..4df8c9f 100644
--- a/screen-api/src/main/java/com/moral/api/entity/User.java
+++ b/screen-api/src/main/java/com/moral/api/entity/User.java
@@ -1,12 +1,18 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+
/**
* <p>
@@ -71,17 +77,17 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
- private LocalDateTime expireTime;
+ private Date expireTime;
/**
* ������������
@@ -89,6 +95,13 @@
private String isDelete;
+ @TableField(exist = false)
+ private Set<Group> groups;
+
+ @TableField(exist = false)
+ private Set<Menu> menus;
+
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.8.0