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/collaborativeApproval/controller/RulesRegulationsManagementFileController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
index 3f770f8..4d77ff7 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.service.IQualityInspectFileService;
import org.springframework.util.CollectionUtils;
@@ -22,7 +23,7 @@
*/
@RestController
@RequestMapping("/rulesRegulationsManagementFile")
-public class RulesRegulationsManagementFileController {
+public class RulesRegulationsManagementFileController extends BaseController {
@Resource
private RulesRegulationsManagementFileService rulesRegulationsManagementFileService;
@@ -34,8 +35,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
- return AjaxResult.success(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
+ public R<?> add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return R.ok(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
}
/**
@@ -44,12 +45,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(rulesRegulationsManagementFileService.removeBatchByIds(ids));
+ return R.ok(rulesRegulationsManagementFileService.removeBatchByIds(ids));
}
/**
@@ -59,8 +60,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
- return AjaxResult.success(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
+ public R<?> listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return R.ok(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
}
}
--
Gitblit v1.9.3