From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/screen-manage/src/main/java/com/moral/api/mapper/TestMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/TestMapper.java
index 46e1799..4771333 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/TestMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/TestMapper.java
@@ -1,7 +1,7 @@
 package com.moral.api.mapper;
 
-import com.moral.api.entity.Test;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.entity.Test;
 
 /**
  * <p>

--
Gitblit v1.8.0