Merge remote-tracking branch 'origin/master'

ibzdst-util/src/main/java/cn/ibizlab/util/helper/DataObject.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.util.StringUtils;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -44,7 +45,7 @@ public class DataObject {
         }
         Object resultValue=fieldValue;
         String targetType=type.getSimpleName();
-        if(targetType.equalsIgnoreCase(fieldValue.getClass().getSimpleName())){
+        if(targetType.equals(fieldValue.getClass().getSimpleName())){
             return resultValue;
         }
         if(targetType.equals("Boolean")){
@@ -379,6 +380,16 @@ public class DataObject {
             return new  java.sql.Timestamp(lValue);
         }
 
+        if(objValue instanceof oracle.sql.TIMESTAMP)
+        {
+            try {
+                oracle.sql.TIMESTAMP tValue = (oracle.sql.TIMESTAMP)objValue;
+                return tValue.timestampValue();
+            } catch (SQLException e) {
+                return tDefault;
+            }
+        }
+
         return tDefault;
     }