From b9df2fc5c64a1d989991655a9e42e4d1f2ec4075 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 06 三月 2025 18:18:11 +0800
Subject: [PATCH] 修改

---
 billion-generator/src/main/resources/vm/java/domain.java.vm |   53 ++++-------------------------------------------------
 1 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/billion-generator/src/main/resources/vm/java/domain.java.vm b/billion-generator/src/main/resources/vm/java/domain.java.vm
index 061c17b..70f3884 100644
--- a/billion-generator/src/main/resources/vm/java/domain.java.vm
+++ b/billion-generator/src/main/resources/vm/java/domain.java.vm
@@ -7,7 +7,7 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.billion.common.annotation.Excel;
 #if($table.crud || $table.sub)
-import com.billion.common.core.domain.BaseEntity;
+import com.billion.main.common.BaseEntity;
 #elseif($table.tree)
 import com.billion.common.core.domain.TreeEntity;
 #end
@@ -23,6 +23,7 @@
 #elseif($table.tree)
 #set($Entity="TreeEntity")
 #end
+@Data
 public class ${ClassName} extends ${Entity}
 {
     private static final long serialVersionUID = 1L;
@@ -40,8 +41,8 @@
 #if($parentheseIndex != -1)
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
 #else
     @Excel(name = "${comment}")
 #end
@@ -55,51 +56,5 @@
     private List<${subClassName}> ${subclassName}List;
 
 #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
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
-        this.$column.javaField = $column.javaField;
-    }
 
-    public $column.javaType get${AttrName}() 
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-#if($table.sub)
-    public List<${subClassName}> get${subClassName}List()
-    {
-        return ${subclassName}List;
-    }
-
-    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
-    {
-        this.${subclassName}List = ${subclassName}List;
-    }
-
-#end
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
-            .append("${subclassName}List", get${subClassName}List())
-#end
-            .toString();
-    }
 }

--
Gitblit v1.9.3