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

gongchunyi

昨天 da54b18e2934c39eb21e246aeda8baef9d1af933

 src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java

@@ -117,6 +117,14 @@
     */

    public String getRunTime()

    {

        return DateUtils.getDatePoor(DateUtils.getNowDate(), DateUtils.getServerStartDate());

        return DateUtils.timeDistance(DateUtils.getNowDate(), DateUtils.getServerStartDate());

    }



    /**

     * 运行参数

     */

    public String getInputArgs()

    {

        return ManagementFactory.getRuntimeMXBean().getInputArguments().toString();

    }

}