From 5ca9bd6876a376c1c2fc4cdc2cf9bbcf7d4684bc Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期五, 17 三月 2023 14:11:24 +0800 Subject: [PATCH] !673 $tab.closePage后存在非首页页签时不应该跳转首页 Merge pull request !673 from Giovanni/master --- ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java index 604ca02..8e142ac 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java @@ -117,7 +117,7 @@ */ public String getRunTime() { - return DateUtils.getDatePoor(DateUtils.getNowDate(), DateUtils.getServerStartDate()); + return DateUtils.timeDistance(DateUtils.getNowDate(), DateUtils.getServerStartDate()); } /** -- Gitblit v1.9.2