From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

---
 src/main/java/com/moral/mapper/ProfessionMapper.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/mapper/ProfessionMapper.java b/src/main/java/com/moral/mapper/ProfessionMapper.java
index 552cfb9..7205cc4 100644
--- a/src/main/java/com/moral/mapper/ProfessionMapper.java
+++ b/src/main/java/com/moral/mapper/ProfessionMapper.java
@@ -3,7 +3,5 @@
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Profession;
 
-import java.util.List;
-
 public interface ProfessionMapper extends BaseMapper<Profession> {
 }

--
Gitblit v1.8.0