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/technology/controller/TechnologyOperationParamController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
index 2932068..92bb773 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.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
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 extends BaseController {
+public class TechnologyOperationParamController {
private final TechnologyOperationParamService technologyOperationParamService;
@@ -36,9 +36,9 @@
}
@DeleteMapping("/batchDelete/{id}")
- @Log(title = "Delete technology operation param", businessType = BusinessType.DELETE)
+ @Log(title = "鍒犻櫎宸ュ簭鍙傛暟", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎宸ュ簭鍙傛暟")
- public R<?> batchDelete(@PathVariable("id") Long id) {
- return R.ok(technologyOperationParamService.batchDelete(id));
+ public AjaxResult batchDelete(@PathVariable("id") Long id) {
+ return AjaxResult.success(technologyOperationParamService.batchDelete(id));
}
}
--
Gitblit v1.9.3