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/AreaMapper.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/mapper/AreaMapper.java b/src/main/java/com/moral/mapper/AreaMapper.java
index cea51c3..681ad1f 100644
--- a/src/main/java/com/moral/mapper/AreaMapper.java
+++ b/src/main/java/com/moral/mapper/AreaMapper.java
@@ -2,9 +2,6 @@
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Area;
-import com.moral.entity.AreaExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
 public interface AreaMapper extends BaseMapper<Area> {
 }
\ No newline at end of file

--
Gitblit v1.8.0