From 5311937b6987a10087269ad0c82bc92f9d1f2a44 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 12 六月 2021 23:41:56 +0800
Subject: [PATCH] update 增加 jackson 配置 默认序列化时间格式
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 4 +---
1 files changed, 1 insertions(+), 3 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 87f7209..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
@@ -29,7 +28,7 @@
private ${pkColumn.javaType} ${pkColumn.javaField};
#foreach ($column in $columns)
-#if($column.isList)
+#if($column.isList && $column.isPk!=1)
/** $column.columnComment */
#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
#if($parentheseIndex != -1)
@@ -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