From 43e5052b91f0568ccbcf3fd6df70cf8209db184a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 28 May 2021 17:36:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-manage/src/main/java/com/moral/api/entity/UserGroup.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/entity/UserGroup.java b/screen-manage/src/main/java/com/moral/api/entity/UserGroup.java
index a595662..a4def76 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/UserGroup.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/UserGroup.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

--
Gitblit v1.8.0