Merge branch 'dev_New_pro' into dev_pro_山西长治

gongchunyi

2026-07-06 76dc7e5445218129cbdce8feef1eea4a82b3069b

 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());

    }



    /**