From ef5adf2e2a4134fd06ae1432df96434de0538ec3 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Thu, 04 Jun 2020 14:53:24 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 修复退出登录重定向到登录页，登录后参数丢失。/article?id=6
---
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
index 850543a..126be47 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
@@ -6,6 +6,7 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.job.CronUtils;
@@ -110,6 +111,7 @@
this.cronExpression = cronExpression;
}
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date getNextValidTime()
{
if (StringUtils.isNotEmpty(cronExpression))
--
Gitblit v1.9.2