From 3cf43da7391aa26f689e3d73d6231bb05929b62b Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Wed, 21 Sep 2022 16:05:27 +0800
Subject: [PATCH] 校准工具类bug修改

---
 screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 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..8fc4e21 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,27 +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;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+    /*
+    * ������������
+    * */
+    @TableField(exist = false)
+    private List<ManageMenu> children;
+
 
 }

--
Gitblit v1.8.0