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/common/util/MyBatisBaseMapUtil.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
index 5b04510..e064724 100644
--- a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
+++ b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
@@ -3,14 +3,8 @@
 import com.github.pagehelper.PageHelper;
 import com.moral.common.bean.PageBean;
 import com.moral.common.mapper.BaseMapper;
-import com.moral.entity.Account;
 import lombok.extern.log4j.Log4j;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.mapperhelper.MapperHelper;
-import tk.mybatis.mapper.mapperhelper.MapperTemplate;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Type;
 import java.util.List;
 
 @Log4j

--
Gitblit v1.8.0