Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

6 天以前 cb86c79d9cf74418a51d022103fc42c7634a0331

 ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -369,6 +369,15 @@
    }

    /**
     *  LocalDateTime转为Date
     * @param time
     * @return
     */
    public static Date localDateTimeToDate(LocalDateTime time) {
        return Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
    }

    /**
     * localdate转为字符串
     *
     * @param time localdate