From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/entity/SysDictData.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysDictData.java b/screen-manage/src/main/java/com/moral/api/entity/SysDictData.java
index e7f9f52..6a6e2a8 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/SysDictData.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/SysDictData.java
@@ -6,6 +6,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +17,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-13
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -28,11 +30,6 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
-
- /**
- * ���Id
- */
- private Integer parentId;
/**
* ������������Id
@@ -52,19 +49,14 @@
private String dataValue;
/**
- * ������������
- */
- private Integer sort;
-
- /**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
--
Gitblit v1.8.0