From f093da99ecb963d19d62dc0f242f00b20bc8895c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 13:22:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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..b641ac3 100644
--- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
@@ -12,6 +12,11 @@
 #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
 
 /**
  * ${functionName}鍒嗛〉鏌ヨ瀵硅薄 ${tableName}
@@ -46,6 +51,9 @@
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField) && $column.query)
 	/** $column.columnComment */
+#if($column.javaType == 'Date')
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+#end
 	@ApiModelProperty("$column.columnComment")
 	private $column.javaType $column.javaField;
 #end

--
Gitblit v1.9.3