From c33c46549b12a674ccabb175c6b0632551780fdd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 26 九月 2019 12:01:20 +0800
Subject: [PATCH] 分享bug解决

---
 utils/src/main/java/org/yeshi/utils/DateUtil.java |    4 +++-
 1 files changed, 3 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 592a8bb..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;// 涓�灏忔椂鐨勬绉掓暟
@@ -55,6 +55,8 @@
 			if (hour > 0 ) {
 				datatime = hour + "鏃�" + min + "鍒�";
 			} else {
+				if (min < 0)
+					min = 0;
 				datatime = min + "鍒�";
 			}
 		}

--
Gitblit v1.8.0