From c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 23 六月 2021 09:44:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' --- ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) 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 865ede4..4c2b7ee 100644 --- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm @@ -6,11 +6,14 @@ import lombok.EqualsAndHashCode; import java.util.Date; -import java.util.Map; -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 /** @@ -24,6 +27,7 @@ #elseif($table.tree) #set($Entity="TreeEntity") #end + @Data @EqualsAndHashCode(callSuper = true) @ApiModel("${functionName}鍒嗛〉鏌ヨ瀵硅薄") -- Gitblit v1.9.3