From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/entity/User.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..4d31a77 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;
/**
@@ -94,12 +96,11 @@
*/
private String isDelete;
+ @Transient
+ private Organization organization;
- @TableField(exist = false)
- private Set<Group> groups;
-
- @TableField(exist = false)
- private Set<Menu> menus;
+ @Transient
+ private List<Group> groups;
@Override
--
Gitblit v1.8.0