From 848c3332f2de93957b06d1471a9eedaa1faec88f Mon Sep 17 00:00:00 2001
From: fuqc0815 <fuqc0815@163.com>
Date: 星期五, 11 十二月 2020 13:43:57 +0800
Subject: [PATCH] Merge branch 'fuqc0815-dev' into 'master'
---
java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java b/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
index 1dfd8fd..07cc70c 100644
--- a/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
@@ -34,13 +34,14 @@
if (value instanceof String && target == Date.class) {
String date = (String) value;
Date newDate = null;
+ SimpleDateFormat strdf = null;
if (date.contains(":")) {
- //sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ strdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
} else {
- sdf = new SimpleDateFormat("yyyy-MM-dd");
+ strdf = new SimpleDateFormat("yyyy-MM-dd");
}
try {
- newDate = sdf.parse(date);
+ newDate = strdf.parse(date);
} catch (ParseException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0