From 77fb7786036fd4c7dd16b9b15c6569cdf2d8ba19 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Nov 2023 16:20:56 +0800
Subject: [PATCH] chore:补充提交

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

diff --git a/screen-api/src/main/java/com/moral/api/entity/Menu.java b/screen-api/src/main/java/com/moral/api/entity/Menu.java
index 951d960..2da0df2 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Menu.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Menu.java
@@ -1,8 +1,11 @@
 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 com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -32,6 +35,7 @@
     /**
      * ���������
      */
+    @TableField(value = "`name`")
     private String name;
 
     /**
@@ -52,16 +56,19 @@
     /**
      * ���������������������������
      */
+    @TableField(value = "`order`")
     private Integer order;
 
     /**
      * ������������
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
      * ������������
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**
@@ -70,9 +77,6 @@
     private String isDelete;
 
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+
 
 }

--
Gitblit v1.8.0