This commit is contained in:
Looly
2019-09-28 03:13:27 +08:00
parent daf85caf9e
commit 596a4f1e57
110 changed files with 535 additions and 617 deletions

View File

@@ -150,7 +150,7 @@ public final class JSONUtil {
return null;
}
JSON json = null;
JSON json;
if (obj instanceof JSON) {
json = (JSON) obj;
} else if (obj instanceof String) {
@@ -648,9 +648,6 @@ public final class JSONUtil {
if (object instanceof Date || object instanceof Calendar) {
return object;
}
if (object instanceof Calendar) {
return ((Calendar) object).getTimeInMillis();
}
// 枚举类保存其字符串形式4.0.2新增)
if (object instanceof Enum) {
return object.toString();