From cf63bb9b554eabf478af71020bc9b7edc9f4ae6b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 17 五月 2020 19:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
index e419487..605725c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
@@ -141,6 +141,16 @@
}
}
+ public static Date parseDotCommon2(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
public static long convertAllTimeToTemp(String st) {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
--
Gitblit v1.8.0