From 811e8e7139ad6e331c2f84bcd5cf3f927a8b3312 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 15 五月 2021 18:22:57 +0800
Subject: [PATCH] Merge https://gitee.com/wuxw7/MicroCommunity

---
 java110-utils/src/main/java/com/java110/utils/util/ApacheBeanConvertUtil.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/ApacheBeanConvertUtil.java b/java110-utils/src/main/java/com/java110/utils/util/ApacheBeanConvertUtil.java
index 5082e29..32ed387 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/ApacheBeanConvertUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/ApacheBeanConvertUtil.java
@@ -29,7 +29,7 @@
     static {
         ConvertUtils.register(new Converter() { //娉ㄥ唽涓�涓棩鏈熻浆鎹㈠櫒
 
-            public Object convert(Class type, Object value) {
+        	public <T> T convert(Class<T> type, Object value) {
                 Date date1 = null;
                 if (value instanceof String) {
                     String date = (String) value;
@@ -44,9 +44,9 @@
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
-                    return date1;
+                    return (T) date1;
                 }
-                return value;
+                return (T) value;
             }
         }, Date.class);
 

--
Gitblit v1.8.0