From 133982999dc61cd4e8acbf8a8d72aeb0251db47f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Jun 2021 14:07:02 +0800
Subject: [PATCH] screen-manage 增加报警以及因子显示单位缓存
---
screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 68dc980..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,10 +1,15 @@
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;
import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,6 +23,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ManageMenu extends Model<ManageMenu> {
private static final long serialVersionUID = 1L;
@@ -51,23 +57,35 @@
/**
* ���������������������������
*/
+ @TableField(value = "`order`")
private Integer order;
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
private String isDelete;
+ /*
+ * ������
+ * */
+ @TableField(value = "`desc`")
+ private String desc;
+
+ /*
+ * ������������
+ * */
+ @TableField(exist = false)
+ private List<ManageMenu> children;
@Override
protected Serializable pkVal() {
--
Gitblit v1.8.0