From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
index 71df814..9c8517e 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
@@ -9,7 +9,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.List;
/**
@@ -39,7 +39,7 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delDocumentationFile(@RequestBody List<Integer> ids) {
+ public AjaxResult delDocumentationFile(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
@@ -48,14 +48,14 @@
}
/**
- *鍒嗛〉鏌ヨ
- * @param page
+ *鏌ヨ
+ * @param
* @param documentationFile
* @return
*/
@GetMapping("/listPage")
- public AjaxResult documentationFileListPage(Page page, DocumentationFile documentationFile) {
- return AjaxResult.success(documentationFileService.documentationFileListPage(page, documentationFile));
+ public AjaxResult documentationFileListPage(DocumentationFile documentationFile) {
+ return AjaxResult.success(documentationFileService.documentationFileListPage( documentationFile));
}
--
Gitblit v1.9.3