合并马老板的冲突

src/main/java/com/zjty/inspect/controller/EvaluationController.java

@@ -157,6 +157,7 @@ public class EvaluationController {
         Evaluation evaluation = evaluationService.findById(id);
         Map<String, String> wps = WpsUtil.createWps(evaluation);
         return ResponseEntity.ok(wps);
+    }
     @ApiOperation("下载报告")
     @ApiImplicitParams({
             @ApiImplicitParam(name="id",value = "报告主键"),
@@ -165,8 +166,6 @@ public class EvaluationController {
             @ApiImplicitParam(name="gong",value = "工作量"),
             @ApiImplicitParam(name="ewai",value = "额外申请")
     })
-    @RequestMapping(value="/download",method= RequestMethod.POST)
-    @AuthAnnotation(code = {"000800"})
     public ResponseEntity download(@RequestBody Download download){
 //        return ResponseEntity.ok("http://120.55.57.35:12345/static/uplaods/a36b17568d4e466dacf9f088a29b4dbc.docx");
 //        return ResponseEntity.ok("http://120.55.57.35:8078/static/defult.docx");