From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/entity/SysDictData.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 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..51ba067 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,29 +49,19 @@
private String dataValue;
/**
- * ������������
- */
- private Integer sort;
-
- /**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0