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/technology/controller/TechnologyOperationParamController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
index 061a50c..2932068 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
@@ -2,7 +2,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyOperationParamDto;
import com.ruoyi.technology.bean.vo.TechnologyOperationParamVo;
@@ -19,7 +19,7 @@
@RequestMapping("/technologyOperationParam")
@Tag(name = "宸ュ簭鍙傛暟")
@RequiredArgsConstructor
-public class TechnologyOperationParamController {
+public class TechnologyOperationParamController extends BaseController {
private final TechnologyOperationParamService technologyOperationParamService;
@@ -38,7 +38,7 @@
@DeleteMapping("/batchDelete/{id}")
@Log(title = "Delete technology operation param", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎宸ュ簭鍙傛暟")
- public AjaxResult batchDelete(@PathVariable("id") Long id) {
- return AjaxResult.success(technologyOperationParamService.batchDelete(id));
+ public R<?> batchDelete(@PathVariable("id") Long id) {
+ return R.ok(technologyOperationParamService.batchDelete(id));
}
}
--
Gitblit v1.9.3