From 5bb748ee77205813f890cd8fc3a9d9067f761dd8 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Wed, 13 Jul 2022 18:07:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/java/mapper.java.vm    |  2 +-
 .../src/main/resources/java/service.java.vm   | 20 +++++++++----------
 .../main/resources/java/serviceImpl.java.vm   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm
index deb76662..577c8fec 100644
--- a/server/like-generator/src/main/resources/java/mapper.java.vm
+++ b/server/like-generator/src/main/resources/java/mapper.java.vm
@@ -1,7 +1,7 @@
 package ${packageName}.common.mapper.${moduleName};
 
 import com.hxkj.common.core.basics.IBaseMapper;
-import com.hxkj.common.entity.${entityName}.${EntityName};
+import com.hxkj.common.entity.${moduleName}.${EntityName};
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm
index 5a283c2c..8318e2a0 100644
--- a/server/like-generator/src/main/resources/java/service.java.vm
+++ b/server/like-generator/src/main/resources/java/service.java.vm
@@ -30,11 +30,11 @@ public interface I${EntityName}Service {
      * @param params 搜索参数
      * @return PageResult<${EntityName}Vo}>
      */
-     #if($isEqually)
-     PageResult<${EntityName}Vo> list(PageParam pageParam, Map<String, String> params);
-     #else
-     PageResult<${EntityName}ListVo> list(PageParam pageParam, Map<String, String> params);
-     #end
+    #if($isEqually)
+    PageResult<${EntityName}Vo> list(PageParam pageParam, Map<String, String> params);
+    #else
+    PageResult<${EntityName}ListVo> list(PageParam pageParam, Map<String, String> params);
+    #end
 #elseif($table.genTpl=="tree")
     /**
      * ${functionName}列表
@@ -57,11 +57,11 @@ public interface I${EntityName}Service {
      * @param id 主键ID
      * @return ${EntityName}
      */
-     #if($isEqually)
-     ${EntityName}Vo detail(Integer id);
-     #else
-     ${EntityName}DetailVo detail(Integer id);
-     #end
+    #if($isEqually)
+    ${EntityName}Vo detail(Integer id);
+    #else
+    ${EntityName}DetailVo detail(Integer id);
+    #end
 
     /**
      * ${functionName}新增
diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
index 461b9341..6897c691 100644
--- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm
+++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
@@ -426,7 +426,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
      * @return ${EntityName}
      */
     @Override
-    public#if($isEqually) ${EntityName}Vo#else  ${EntityName}DetailVo#end detail(Integer id) {
+    public#if($isEqually) ${EntityName}Vo#else ${EntityName}DetailVo#end detail(Integer id) {
         Article model = ${entityName}Mapper.selectOne(
             #if($field.contains("is_delete"))
                 new QueryWrapper<${EntityName}>()