From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/AlarmUser.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/AlarmUser.java b/src/main/java/com/moral/entity/AlarmUser.java
index 001b85d..2b706f5 100644
--- a/src/main/java/com/moral/entity/AlarmUser.java
+++ b/src/main/java/com/moral/entity/AlarmUser.java
@@ -3,6 +3,7 @@
import java.util.Date;
import javax.persistence.Id;
+import javax.persistence.Transient;
import lombok.Data;
@@ -116,4 +117,7 @@
* @mbg.generated Wed Dec 27 16:21:08 CST 2017
*/
private String nickName;
+
+ @Transient
+ private Organization organization;
}
\ No newline at end of file
--
Gitblit v1.8.0