Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

9 小时以前 124a6178ae918de05886b52199b7755d4fa1ece3

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

    }



    /**