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/approve/controller/ApproveNodeController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index d0af196..cdd5e0a 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,7 +2,8 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -15,7 +16,7 @@
@RestController
@RequestMapping("/approveNode")
@AllArgsConstructor
-public class ApproveNodeController {
+public class ApproveNodeController extends BaseController {
private IApproveNodeService approveNodeService;
@@ -26,8 +27,8 @@
*/
@GetMapping("/details/{id}")
@Operation(summary = "娴佺▼鐘舵�佽鎯�")
- public AjaxResult details(@PathVariable String id) {
- return AjaxResult.success(approveNodeService.details(id));
+ public R<?> details(@PathVariable String id) {
+ return R.ok(approveNodeService.details(id));
}
/**
@@ -38,9 +39,9 @@
@PostMapping("/updateApproveNode")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "瀹℃壒鑺傜偣")
- public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
+ public R<?> updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -49,9 +50,9 @@
* @return
*/
@PostMapping("/init")
- public AjaxResult init(String id) {
+ public R<?> init(String id) {
approveNodeService.initApproveNodes("",id,1L);
- return AjaxResult.success();
+ return R.ok();
}
}
--
Gitblit v1.9.3