From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java | 6 ++++++
1 files changed, 6 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 07ad57e..bacb205 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
@@ -102,6 +102,12 @@
}
return 0;
}
+
+ public static String formatDate(Date time) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ String date = sdf.format(time);
+ return date;
+ }
public static long convertToTimeTemp(String st, String format) {
Date date = new Date();
--
Gitblit v1.8.0