From 67f311be5d75450de39ab8b25181c1c7dc11a151 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 17 七月 2019 15:33:29 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index 11666d3..ba558da 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -430,6 +430,8 @@
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.serializeNulls();
+ gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");
+
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
--
Gitblit v1.8.0