From 5b4e9ef4dbdc8f2170afbde09be96c21bb9766e1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 四月 2021 09:50:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 17e706d..f6f6bd2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -8,6 +8,7 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -20,7 +21,7 @@
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("sys_menu")
-public class SysMenu
+public class SysMenu implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
@@ -34,6 +35,7 @@
     private String menuName;
 
     /** 鐖惰彍鍗曞悕绉� */
+    @TableField(exist = false)
     private String parentName;
 
     /** 鐖惰彍鍗旾D */

--
Gitblit v1.9.3