From 6009c2c07cd32a76b32c8d63a5a017be695c5ea5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 15:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 utils/src/main/java/org/yeshi/utils/DateUtil.java |    2 ++
 1 files changed, 2 insertions(+), 0 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..3987601 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -55,6 +55,8 @@
 			if (hour > 0 ) {
 				datatime = hour + "鏃�" + min + "鍒�";
 			} else {
+				if (min < 0)
+					min = 0;
 				datatime = min + "鍒�";
 			}
 		}

--
Gitblit v1.8.0