From 9051d6194b11a2151bd62b9be731689524a32d5a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 12:58:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java
index c80bf7a..674b7bf 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java
@@ -84,7 +84,7 @@
@ApiOperation("删除目录及子项")
@DeleteMapping("/directory/{id}")
- public ResponseEntity<Map<String, Object>> deleteDirectory(@PathVariable Integer id) {
+ public ResponseEntity<Map<String, Object>> deleteDirectory(@PathVariable String id) {
Map<String, Object> result = new HashMap<>();
try {
boolean success = directoryService.deleteDirectory(id);
@@ -156,7 +156,7 @@
@ApiOperation("删除标记")
@DeleteMapping("/{id}")
- public ResponseEntity<Map<String, Object>> deleteAnnotation(@PathVariable Integer id) {
+ public ResponseEntity<Map<String, Object>> deleteAnnotation(@PathVariable String id) {
Map<String, Object> result = new HashMap<>();
try {
boolean success = annotationService.deleteAnnotation(id);
--
Gitblit v1.9.3