From 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 23 Apr 2021 14:49: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/ManageMenu.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java b/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
index 68dc980..7249cfc 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
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 lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +15,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -56,18 +57,23 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
private String isDelete;
+ /**
+ * ������
+ */
+ private String desc;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.8.0