From 42008124b68bfd7f2e2003c07bc0bdd5311f95b6 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 29 四月 2020 09:17:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi/src/main/resources/vm/java/domain.java.vm | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm index 0ea5a60..d2f1219 100644 --- a/ruoyi/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi/src/main/resources/vm/java/domain.java.vm @@ -12,16 +12,23 @@ import com.baomidou.mybatisplus.annotation.IdType; import java.io.Serializable; import java.util.Date; -#foreach ($import in $importList) -import ${import}; +#if($table.crud) +import com.ruoyi.framework.web.domain.BaseEntity; +#elseif($table.tree) +import com.ruoyi.framework.web.domain.TreeEntity; #end /** * ${functionName}瀵硅薄 ${tableName} - * + * * @author ${author} * @date ${datetime} */ +#if($table.crud) +#set($Entity="BaseEntity") +#elseif($table.tree) +#set($Entity="TreeEntity") +#end @Data @ToString @EqualsAndHashCode -- Gitblit v1.9.3