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/RoleMenu.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/RoleMenu.java b/src/main/java/com/moral/entity/RoleMenu.java
index c489608..8c0327a 100644
--- a/src/main/java/com/moral/entity/RoleMenu.java
+++ b/src/main/java/com/moral/entity/RoleMenu.java
@@ -13,6 +13,8 @@
private Integer menuId;
+ private Integer channelId;
+
@Transient
private Role role;
--
Gitblit v1.8.0