From 866c69e70638ba22672520aecedad0d76fe3ca51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Sun, 4 Apr 2021 11:27:08 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm | 5 +++++ .../src/main/resources/vm/java/serviceImpl.java.vm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm index 865ede4a..b98b42fc 100644 --- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm @@ -12,6 +12,11 @@ import java.util.HashMap; #foreach ($import in $importList) import ${import}; #end +#if($table.crud || $table.sub) +import com.ruoyi.common.core.domain.BaseEntity; +#elseif($table.tree) +import com.ruoyi.common.core.domain.TreeEntity; +#end /** * ${functionName}分页查询对象 ${tableName} diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index 86657054..cbf9d323 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -32,7 +32,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C @Override public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){ ${ClassName} db = this.baseMapper.selectById(${pkColumn.javaField}); - return BeanUtil.toBean(db, ${ClassName}Vo.class) + return BeanUtil.toBean(db, ${ClassName}Vo.class); } @Override