From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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