Merge remote-tracking branch 'refs/remotes/origin/dev_New' into jtwy

liyong

10 天以前 69bb4a6479653f2e27cb67ce0ab817bd40e9c791

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

    }



    /**