From 662251e208e58a9940efb200457c49ed342cd06f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 14 九月 2021 10:16:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index b6eca82..29a4f23 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -7,7 +7,6 @@
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
-import com.ruoyi.common.annotation.Excel;
/**
* ${functionName}瀵硅薄 ${tableName}
@@ -25,7 +24,9 @@
#foreach ($column in $columns)
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
#if($column.javaField=="createBy"||$column.javaField=="createTime")
@TableField(fill = FieldFill.INSERT)
#end
--
Gitblit v1.9.3