From 63a1ae838de8499904822b7712e7b2d0dc85ff4b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 02 八月 2019 14:45:37 +0800
Subject: [PATCH] 修复 vue.min.js:6 ReferenceError: roomInfo is not defined
---
java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java b/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
index 169ff69..3097711 100644
--- a/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
+++ b/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
@@ -33,7 +33,12 @@
Date date1 = null;
if (value instanceof String) {
String date = (String) value;
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf = null;
+ if (date.contains(":")) {
+ sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ } else {
+ sdf = new SimpleDateFormat("yyyy-MM-dd");
+ }
try {
date1 = sdf.parse(date);
} catch (ParseException e) {
@@ -44,6 +49,8 @@
return value;
}
}, Date.class);
+
+ ConvertUtils.register(new Java110StringConvert(), String.class);
}
--
Gitblit v1.8.0