From b98a61c0c707c9fc3a51e68fe67909cb06aaafcd Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 17 Jun 2021 11:45:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java | 11 +++++++++++
1 files changed, 11 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 0f89b6f..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;
@@ -8,6 +9,7 @@
import java.util.Date;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,6 +23,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ManageMenu extends Model<ManageMenu> {
private static final long serialVersionUID = 1L;
@@ -54,6 +57,7 @@
/**
* ���������������������������
*/
+ @TableField(value = "`order`")
private Integer order;
/**
@@ -72,8 +76,15 @@
private String isDelete;
/*
+ * ������
+ * */
+ @TableField(value = "`desc`")
+ private String desc;
+
+ /*
* ������������
* */
+ @TableField(exist = false)
private List<ManageMenu> children;
@Override
--
Gitblit v1.8.0