Merge branch 'dev1'

Administrator

2018-12-07 3b7a7eb6aa8d857dc9f2e03cd947e8f8482bf14b

Merge branch 'dev1'

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