Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-10 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2

 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();