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/SysDictType.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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..e479894 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;

--
Gitblit v1.8.0