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/basic/controller/SupplierManageFileController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
index 2d43f65..3829aa4 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.SupplierManageFile;
import com.ruoyi.basic.service.SupplierManageFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +16,7 @@
*/
@RestController
@RequestMapping("/basic/supplierManageFile")
-public class SupplierManageFileController {
+public class SupplierManageFileController extends BaseController {
@Resource
@@ -28,8 +29,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody SupplierManageFile supplierManageFile) {
- return AjaxResult.success(supplierManageFileService.save(supplierManageFile));
+ public R<?> add(@RequestBody SupplierManageFile supplierManageFile) {
+ return R.ok(supplierManageFileService.save(supplierManageFile));
}
/**
@@ -38,12 +39,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delSupplierManageFile(@RequestBody List<Integer> ids) {
+ public R<?> delSupplierManageFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(supplierManageFileService.removeBatchByIds(ids));
+ return R.ok(supplierManageFileService.removeBatchByIds(ids));
}
/**
@@ -53,8 +54,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult supplierManageFileListPage(Page page, SupplierManageFile supplierManageFile) {
- return AjaxResult.success(supplierManageFileService.supplierManageFileListPage(page, supplierManageFile));
+ public R<?> supplierManageFileListPage(Page page, SupplierManageFile supplierManageFile) {
+ return R.ok(supplierManageFileService.supplierManageFileListPage(page, supplierManageFile));
}
--
Gitblit v1.9.3