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/procurementrecord/controller/ProcurementPlanController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
index 1d442a9..a110a5c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.pojo.ProcurementPlan;
import com.ruoyi.procurementrecord.service.ProcurementPlanService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,30 +28,30 @@
@RequestMapping("/listPage")
@Operation(summary = "閲囪喘璁″垝-鏌ヨ")
- public AjaxResult listPage(Page page, ProcurementPlan procurementPlan){
+ public R<?> listPage(Page page, ProcurementPlan procurementPlan){
IPage<ProcurementPlan> result = procurementPlanService.listPage(page, procurementPlan);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
@Operation(summary = "閲囪喘璁″垝-娣诲姞")
- public AjaxResult add(@RequestBody ProcurementPlan procurementPlan){
+ public R<?> add(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.save(procurementPlan);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "閲囪喘璁″垝-淇敼")
- public AjaxResult update(@RequestBody ProcurementPlan procurementPlan){
+ public R<?> update(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.updateById(procurementPlan);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@DeleteMapping("/del")
@Operation(summary = "閲囪喘璁″垝-鍒犻櫎")
- public AjaxResult del(@RequestBody List<Long> ids){
+ public R<?> del(@RequestBody List<Long> ids){
boolean result = procurementPlanService.removeByIds(ids);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
/**
--
Gitblit v1.9.3