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, 1 insertions(+), 12 deletions(-) diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm index bc4bf86..d2f1219 100644 --- a/ruoyi/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi/src/main/resources/vm/java/domain.java.vm @@ -17,13 +17,10 @@ #elseif($table.tree) import com.ruoyi.framework.web.domain.TreeEntity; #end -#foreach ($import in $importList) -import ${import}; -#end /** * ${functionName}瀵硅薄 ${tableName} - * + * * @author ${author} * @date ${datetime} */ @@ -64,16 +61,8 @@ #if($column.isPk==1) @TableId(value = "$column.columnName", type = IdType.AUTO) private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) #else private $column.javaType $column.javaField; -#end #end #end } -- Gitblit v1.9.3