合并分支 'gwj' 到 'master'

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/controller/UserManageController.java

@@ -46,11 +46,11 @@ public class UserManageController {
         return ok(userManageService.findDepartmentList(id));
     }
 
-    @ApiOperation(value = "查询人员任务详情", response = User.class)
-    @GetMapping("/findUserWork/{id}/{status}")
-    public ResponseEntity findUserWork(@PathVariable("id") String id,
-                                             @PathVariable("status") String status) {
-        return ok(userManageService.findUserWork(id,status));
-    }
+//    @ApiOperation(value = "查询人员任务详情", response = User.class)
+//    @GetMapping("/findUserWork/{id}/{status}")
+//    public ResponseEntity findUserWork(@PathVariable("id") String id,
+//                                             @PathVariable("status") String status) {
+//        return ok(userManageService.findUserWork(id,status));
+//    }
 
 }