Merge branch 'jtwy' into dev_New

zss

2 天以前 64027e45c5b0d9dfe1a5536f30ca9183af24b456

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

    }



    /**