From ef5adf2e2a4134fd06ae1432df96434de0538ec3 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: 星期四, 04 六月 2020 14:53:24 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 修复退出登录重定向到登录页，登录后参数丢失。/article?id=6
---
ruoyi/src/main/resources/vm/java/domain.java.vm | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm
index e99ef2c..c943c1b 100644
--- a/ruoyi/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi/src/main/resources/vm/java/domain.java.vm
@@ -1,5 +1,8 @@
package ${packageName}.domain;
+#foreach ($import in $importList)
+import ${import};
+#end
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -7,9 +10,6 @@
import com.ruoyi.framework.web.domain.BaseEntity;
#elseif($table.tree)
import com.ruoyi.framework.web.domain.TreeEntity;
-#end
-#foreach ($import in $importList)
-import ${import};
#end
/**
@@ -40,6 +40,7 @@
#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")
#else
@Excel(name = "${comment}")
--
Gitblit v1.9.2