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/SysDictData.java | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/SysDictData.java b/screen-api/src/main/java/com/moral/api/entity/SysDictData.java
index 11d6903..9866782 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SysDictData.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SysDictData.java
@@ -16,7 +16,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -29,11 +29,6 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
-
- /**
- * ���Id
- */
- private Integer parentId;
/**
* ������������Id
@@ -51,11 +46,6 @@
*/
@TableField("dataValue")
private String dataValue;
-
- /**
- * ������������
- */
- private Integer sort;
/**
* ������������
--
Gitblit v1.8.0