From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/entity/User.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 4df8c9f..38f7b34 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
@@ -7,11 +7,13 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
import java.util.Set;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.persistence.Transient;
/**
@@ -93,14 +95,6 @@
* ������������
*/
private String isDelete;
-
-
- @TableField(exist = false)
- private Set<Group> groups;
-
- @TableField(exist = false)
- private Set<Menu> menus;
-
@Override
protected Serializable pkVal() {
--
Gitblit v1.8.0