From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/entity/Menu.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/Menu.java b/src/main/java/com/moral/entity/Menu.java
index 4d5ab07..535b607 100644
--- a/src/main/java/com/moral/entity/Menu.java
+++ b/src/main/java/com/moral/entity/Menu.java
@@ -3,6 +3,7 @@
import java.util.Date;
import javax.persistence.Id;
+import javax.persistence.Transient;
import lombok.Data;
@@ -14,6 +15,8 @@
private String menuCode;
private String menuName;
+
+ private Integer channelId;
private String menuIcon;
@@ -35,4 +38,7 @@
private String updateUser;
+ @Transient
+ private Channel channel;
+
}
--
Gitblit v1.8.0