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 params); - #else - PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); - #end + #if($isEqually) + PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); + #else + PageResult<${EntityName}ListVo> list(PageParam pageParam, Map 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}>()