Merge commit 'e0296ea7' into dev_pro_河南鹤壁_首检

gongchunyi

2 天以前 2a8a4cf20e55bbef3a9f8959136ee828b058dac0

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

    }



    /**