From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server 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