From 4661edf7f07f6003195ebff8d3c3caaeb3567b87 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期日, 23 四月 2023 14:55:46 +0800 Subject: [PATCH] !712 修复路由跳转被阻止时vue-router内部产生报错信息问题 Merge pull request !712 from 爱吃猫的鱼/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