From 52c6d1a36c708d5047ca7b44a418c00793b90a73 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 28 八月 2019 15:05:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 utils/src/main/java/org/yeshi/utils/DateUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index 3987601..f6a0bb6 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -37,7 +37,7 @@
 
 	public static String dateDiff2(Date startTime, Date endTime) throws Exception {
 
-		String datatime = "0鍒嗛挓";
+		String datatime = "0鍒�";
 
 		long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
 		long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟

--
Gitblit v1.8.0