From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
index 4428fd7..f32d87b 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -12,8 +12,8 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -34,8 +34,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityInspectFile qualityInspectFile) {
- return AjaxResult.success(qualityInspectFileService.save(qualityInspectFile));
+ public R<?> add(@RequestBody QualityInspectFile qualityInspectFile) {
+ return R.ok(qualityInspectFileService.save(qualityInspectFile));
}
/**
@@ -44,12 +44,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(qualityInspectFileService.removeBatchByIds(ids));
+ return R.ok(qualityInspectFileService.removeBatchByIds(ids));
}
/**
@@ -59,8 +59,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
- return AjaxResult.success(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
+ public R<?> qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
+ return R.ok(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
}
--
Gitblit v1.9.3