Merge remote-tracking branch 'origin/master' into div

admin

2019-07-31 5046ecde3cd849511a337e25e13af7df7f1894bc

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