From e9a3f108de4f79fe6f246cd30f4427fc6aad5450 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 05 九月 2019 18:00:06 +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, 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