From 535296ad8d0482856e98f788c667f3fa72576637 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 10 Mar 2021 17:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index 69f256d..9f5ea52 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -45,6 +45,8 @@
/** DateFormat������ */
private static Map<String, DateFormat> dateFormatMap = new HashMap<String, DateFormat>();
+
+
/**
* ������DateFormat
*
@@ -1257,11 +1259,10 @@
- public static void main(String[] args) {
- Date newdate = new Date();
- SimpleDateFormat dft = new SimpleDateFormat("yyyyMMdd");
- String date = dft.format(newdate);
- System.out.println(date);
-// return endDate;
+ public static void main(String[] args) throws InterruptedException {
+ Date date1 = new Date();
+ Thread.sleep(1000);
+ Date date2 = new Date();
+ System.out.println(DateUtils.compareDateStr(date1,date2));
}
}
--
Gitblit v1.8.0