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