From ea3bcc24543202a55b22623cad8dd8900d550242 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 29 十月 2024 14:05:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
index 0f1a651..c371fbd 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
@@ -25,7 +25,7 @@
 @RequiredArgsConstructor
 @Api(value = "鐝骇", tags = "鐝骇绠$悊")
 @RestController
-@RequestMapping("/api/classes")
+@RequestMapping("/api/admin/classes")
 public class ClassesController {
 
     private final ClassesService classesService;
@@ -72,6 +72,13 @@
         return classesService.dissolution(id);
     }
 
+    @PutMapping("/recover/{id}")
+    @ApiOperation(value = "鎭㈠姝e父", notes = "鎭㈠姝e父")
+    @PreAuthorize("hasAuthority('classes:recover')")
+    public Result recover(@PathVariable("id") Integer id) {
+        return classesService.recover(id);
+    }
+
     @GetMapping("/{id}")
     @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
     @PreAuthorize("hasAuthority('classes:detail')")
@@ -85,4 +92,12 @@
     public Result list() {
         return classesService.all();
     }
+
+    @GetMapping("/my")
+    @PreAuthorize("hasAuthority('classes:my')")
+    @ApiOperation(value = "鎴戠殑鐝骇(鑰佸笀鐨勭彮绾�)", notes = "鎴戠殑鐝骇(鑰佸笀鐨勭彮绾�)")
+    public Result myClassList() {
+        return classesService.myClassList();
+    }
+
 }

--
Gitblit v1.8.0