From d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 20 五月 2026 09:22:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
index 604ca02..8e142ac 100644
--- a/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
+++ b/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.3