From c5c98542e39f10b842b53579cc270207318c12e4 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sat, 15 Feb 2020 22:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8import=E7=BC=BA=E5=A4=B1=E5=8C=85=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/template/generator/admin/Controller.ftl  | 2 +-
 .../src/main/resources/template/generator/admin/Mapper.ftl      | 2 +-
 .../main/resources/template/generator/admin/QueryCriteria.ftl   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yshop-system/src/main/resources/template/generator/admin/Controller.ftl b/yshop-system/src/main/resources/template/generator/admin/Controller.ftl
index 4c3e0787..28fbdb82 100644
--- a/yshop-system/src/main/resources/template/generator/admin/Controller.ftl
+++ b/yshop-system/src/main/resources/template/generator/admin/Controller.ftl
@@ -1,6 +1,6 @@
 package ${package}.rest;
 
-import Log;
+import co.yixiang.aop.log.Log;
 import ${package}.domain.${className};
 import ${package}.service.${className}Service;
 import ${package}.service.dto.${className}QueryCriteria;
diff --git a/yshop-system/src/main/resources/template/generator/admin/Mapper.ftl b/yshop-system/src/main/resources/template/generator/admin/Mapper.ftl
index ffdb1389..bf4538a9 100644
--- a/yshop-system/src/main/resources/template/generator/admin/Mapper.ftl
+++ b/yshop-system/src/main/resources/template/generator/admin/Mapper.ftl
@@ -1,6 +1,6 @@
 package ${package}.service.mapper;
 
-import BaseMapper;
+import co.yixiang.base.BaseMapper;
 import ${package}.domain.${className};
 import ${package}.service.dto.${className}Dto;
 import org.mapstruct.Mapper;
diff --git a/yshop-system/src/main/resources/template/generator/admin/QueryCriteria.ftl b/yshop-system/src/main/resources/template/generator/admin/QueryCriteria.ftl
index 39b53ad9..20d5f854 100644
--- a/yshop-system/src/main/resources/template/generator/admin/QueryCriteria.ftl
+++ b/yshop-system/src/main/resources/template/generator/admin/QueryCriteria.ftl
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 import java.util.List;
 </#if>
 <#if queryColumns??>
-import Query;
+import co.yixiang.annotation.Query;
 </#if>
 
 /**