From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/entity/SysDictType.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/SysDictType.java b/screen-api/src/main/java/com/moral/api/entity/SysDictType.java
index e0636a0..d1d0dcf 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SysDictType.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SysDictType.java
@@ -15,7 +15,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -40,6 +40,11 @@
private String desc;
/**
+ * ������������ ������������
+ */
+ private Integer system;
+
+ /**
* ������������
*/
private Date createTime;
@@ -54,10 +59,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0