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/projectManagement/controller/PlanController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
index c8b982c..5ec8191 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
@@ -1,6 +1,7 @@
package com.ruoyi.projectManagement.controller;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.projectManagement.service.PlanService;
import com.ruoyi.projectManagement.vo.SavePlanNodeVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
@@ -22,28 +23,28 @@
@RequestMapping("/projectManagement/plan")
@Tag(name = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
-public class PlanController {
+public class PlanController extends BaseController {
private final PlanService planService;
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
- public AjaxResult save(@RequestBody @Valid SavePlanVo savePlanVo) {
+ public R<?> save(@RequestBody @Valid SavePlanVo savePlanVo) {
planService.savePlan(savePlanVo);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@PathVariable Long id) {
+ public R<?> delete(@PathVariable Long id) {
planService.deletePlan(id);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/listPage")
@Operation(summary = "鍒嗛〉鍒楄〃")
- public AjaxResult listPage(@RequestBody SearchPlanVo searchPlanVo) {
- return AjaxResult.success(planService.searchPlan(searchPlanVo));
+ public R<?> listPage(@RequestBody SearchPlanVo searchPlanVo) {
+ return R.ok(planService.searchPlan(searchPlanVo));
}
}
--
Gitblit v1.9.3