Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-05-22 0cb3eeb5b498f063f890b164d26ab9a0d0d79a1c

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

    }



    /**