From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java b/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
index 697d6e1..522ee7e 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
@@ -1,6 +1,7 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
@@ -56,6 +57,7 @@
/**
* ���������������������������
*/
+ @TableField(value = "`order`")
private Integer order;
/**
@@ -74,8 +76,15 @@
private String isDelete;
/*
+ * ������
+ * */
+ @TableField(value = "`desc`")
+ private String desc;
+
+ /*
* ������������
* */
+ @TableField(exist = false)
private List<ManageMenu> children;
@Override
--
Gitblit v1.8.0