From 3b2194fd176ce3938f113f1c31b00e1ae569c57c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 15 五月 2021 12:59:39 +0800
Subject: [PATCH] !6 解决一些代码错误（没有修改任何逻辑） Merge pull request !6 from aa51513/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