From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
index 3829aa4..2d43f65 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
@@ -3,8 +3,7 @@
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.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -16,7 +15,7 @@
*/
@RestController
@RequestMapping("/basic/supplierManageFile")
-public class SupplierManageFileController extends BaseController {
+public class SupplierManageFileController {
@Resource
@@ -29,8 +28,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody SupplierManageFile supplierManageFile) {
- return R.ok(supplierManageFileService.save(supplierManageFile));
+ public AjaxResult add(@RequestBody SupplierManageFile supplierManageFile) {
+ return AjaxResult.success(supplierManageFileService.save(supplierManageFile));
}
/**
@@ -39,12 +38,12 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delSupplierManageFile(@RequestBody List<Integer> ids) {
+ public AjaxResult delSupplierManageFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(supplierManageFileService.removeBatchByIds(ids));
+ return AjaxResult.success(supplierManageFileService.removeBatchByIds(ids));
}
/**
@@ -54,8 +53,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> supplierManageFileListPage(Page page, SupplierManageFile supplierManageFile) {
- return R.ok(supplierManageFileService.supplierManageFileListPage(page, supplierManageFile));
+ public AjaxResult supplierManageFileListPage(Page page, SupplierManageFile supplierManageFile) {
+ return AjaxResult.success(supplierManageFileService.supplierManageFileListPage(page, supplierManageFile));
}
--
Gitblit v1.9.3