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

buhuazhen

10 天以前 75ebf501d1a0649c939bbf812fc9984b8f998c3f

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

    }



    /**