ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -70,7 +70,11 @@ public static final String parseDateToStr(final String format, final Date date) { return new SimpleDateFormat(format).format(date); if(date==null){ return ""; }else { return new SimpleDateFormat(format).format(date); } } public static final Date dateTime(final String format, final String ts)