From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage

---
 src/main/java/com/highdatas/mdm/entity/SysMenu.java |   56 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/highdatas/mdm/entity/SysMenu.java b/src/main/java/com/highdatas/mdm/entity/SysMenu.java
index a9e0bd8..2f1647a 100644
--- a/src/main/java/com/highdatas/mdm/entity/SysMenu.java
+++ b/src/main/java/com/highdatas/mdm/entity/SysMenu.java
@@ -3,10 +3,10 @@
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.highdatas.mdm.pojo.MaintainDataType;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -42,26 +42,24 @@
     private Integer orderNo;
 
     @TableField("create_time")
-    private transient Date createTime;
+    private  Date createTime;
 
     @TableField("update_time")
-    private transient Date updateTime;
+    private  Date updateTime;
 
-    @TableField("data_type")
-    private MaintainDataType dataType;
 
     @TableField("menu_type")
     private String menuType;
 
+    @TableField(exist = false)
+    private  List<SysMenu> parentMenuList;
+    @TableField(exist = false)
+    private  boolean subscribe;
+    @TableField(exist = false)
+    private  boolean show;
+    @TableField(exist = false)
+    private String tableName;
 
-    public MaintainDataType getDataType() {
-        return dataType;
-    }
-
-    public SysMenu setDataType(MaintainDataType dataType) {
-        this.dataType = dataType;
-        return this;
-    }
 
     public String getMenuType() {
         return menuType;
@@ -138,4 +136,36 @@
         ", updateTime=" + updateTime +
         "}";
     }
+
+    public List<SysMenu> getParentMenuList() {
+        return parentMenuList;
+    }
+
+    public void setParentMenuList(List<SysMenu> parentMenuList) {
+        this.parentMenuList = parentMenuList;
+    }
+
+    public boolean isSubscribe() {
+        return subscribe;
+    }
+
+    public void setSubscribe(boolean subscribe) {
+        this.subscribe = subscribe;
+    }
+
+    public boolean isShow() {
+        return show;
+    }
+
+    public void setShow(boolean show) {
+        this.show = show;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
 }

--
Gitblit v1.8.0