Merge remote-tracking branch 'origin/master'

admin

2018-12-12 dc73adfa9d92d11d1a8512778deacc34fa877eef

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java

@@ -316,9 +316,6 @@
         data.put("type", "." + type);

         data.put("state", "SUCCESS");

         out.print(JsonUtil.loadTrueResult(data));

			
         out.print(JsonUtil.loadTrueResult(uploadPath));



      } catch (IOException e) {

         out.print(JsonUtil.loadFalseResult("上传图片失败"));

         e.printStackTrace();