合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/ApprovalController.java

@@ -171,7 +171,7 @@ public class ApprovalController {
     }
 
     @ApiOperation(value = "删除加班审批")
-    @DeleteMapping("/delete/{id}")
+    @DeleteMapping("/deleteWorkover/{id}")
     public ResponseEntity deleteWorkover(@PathVariable("id") String id) {
         try {
             boolean b = approvalInformationService.deleteWorkover(id);