Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

3 天以前 d0a20f29f07dc24c1fc0b27b8572b24a083d8c0d

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

    }



    /**