From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据

---
 screen-manage/src/main/java/com/moral/api/entity/Menu.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/entity/Menu.java b/screen-manage/src/main/java/com/moral/api/entity/Menu.java
index 916591e..1131ef8 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Menu.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Menu.java
@@ -1,10 +1,14 @@
 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.moral.anno.FieldName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -31,47 +35,51 @@
     /**
      * ���������
      */
+    @FieldName("������������")
     private String name;
 
     /**
      * url������
      */
+    @FieldName("url")
     private String url;
 
     /**
      * ������������
      */
+    @FieldName("������url")
     private String icon;
 
     /**
      * ���������
      */
+    @FieldName("���������id")
     private Integer parentId;
 
     /**
      * ���������������������������
      */
+    @FieldName("������������")
+    @TableField(value="`order`")
     private Integer order;
 
     /**
      * ������������
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * ������������
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * ������������
      */
     private String isDelete;
 
+    @TableField(exist = false)
+    private List<Menu> children;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
 
 }

--
Gitblit v1.8.0