From c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 23 六月 2021 09:44:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index 4641d78..b07a7b4 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -1,7 +1,6 @@
package ${packageName}.vo;
import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
#foreach ($import in $importList)
import ${import};
#end
@@ -41,7 +40,6 @@
@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
#elseif($column.javaType == 'Date')
@Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
#else
@Excel(name = "${comment}")
#end
--
Gitblit v1.9.3