From 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 01 Sep 2021 11:02:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/entity/Menu.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 916591e..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,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 com.fasterxml.jackson.annotation.JsonFormat;
+
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,6 +35,7 @@
/**
* ���������
*/
+ @TableField(value = "`name`")
private String name;
/**
@@ -51,17 +56,20 @@
/**
* ���������������������������
*/
+ @TableField(value = "`order`")
private Integer order;
/**
* ������������
*/
- private LocalDateTime createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
/**
* ������������
@@ -69,9 +77,6 @@
private String isDelete;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0