From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
index 9c8517e..6ec0e54 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.pojo.DocumentationFile;
import com.ruoyi.warehouse.service.DocumentationFileService;
import org.springframework.util.CollectionUtils;
@@ -17,7 +18,7 @@
*/
@RestController
@RequestMapping("/documentation/documentationFile")
-public class DocumentationFileController {
+public class DocumentationFileController extends BaseController {
@Resource
@@ -29,8 +30,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody DocumentationFile documentationFile) {
- return AjaxResult.success(documentationFileService.save(documentationFile));
+ public R<?> add(@RequestBody DocumentationFile documentationFile) {
+ return R.ok(documentationFileService.save(documentationFile));
}
/**
@@ -39,12 +40,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delDocumentationFile(@RequestBody List<Long> ids) {
+ public R<?> delDocumentationFile(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(documentationFileService.removeBatchByIds(ids));
+ return R.ok(documentationFileService.removeBatchByIds(ids));
}
/**
@@ -54,8 +55,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult documentationFileListPage(DocumentationFile documentationFile) {
- return AjaxResult.success(documentationFileService.documentationFileListPage( documentationFile));
+ public R<?> documentationFileListPage(DocumentationFile documentationFile) {
+ return R.ok(documentationFileService.documentationFileListPage( documentationFile));
}
--
Gitblit v1.9.3