From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
index c9eff23..2932068 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
@@ -2,14 +2,14 @@
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;
import com.ruoyi.technology.pojo.TechnologyOperationParam;
import com.ruoyi.technology.service.TechnologyOperationParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,28 +17,28 @@
@RestController
@RequestMapping("/technologyOperationParam")
-@Api(tags = "宸ュ簭鍙傛暟")
+@Tag(name = "宸ュ簭鍙傛暟")
@RequiredArgsConstructor
-public class TechnologyOperationParamController {
+public class TechnologyOperationParamController extends BaseController {
private final TechnologyOperationParamService technologyOperationParamService;
@GetMapping("/list")
- @ApiOperation("宸ュ簭鍙傛暟鍒楄〃鏌ヨ")
+ @Operation(summary = "宸ュ簭鍙傛暟鍒楄〃鏌ヨ")
public R<List<TechnologyOperationParamVo>> list(TechnologyOperationParamDto technologyOperationParamDto) {
return R.ok(technologyOperationParamService.listOperationParam(technologyOperationParamDto));
}
@PostMapping("/")
- @ApiOperation("鏂板鎴栦慨鏀瑰伐搴忓弬鏁�")
+ @Operation(summary = "鏂板鎴栦慨鏀瑰伐搴忓弬鏁�")
public R addOrUpdate(@RequestBody TechnologyOperationParam technologyOperationParam) {
return R.ok(technologyOperationParamService.saveTechnologyOperationParam(technologyOperationParam));
}
@DeleteMapping("/batchDelete/{id}")
@Log(title = "Delete technology operation param", businessType = BusinessType.DELETE)
- @ApiOperation("鍒犻櫎宸ュ簭鍙傛暟")
- public AjaxResult batchDelete(@PathVariable("id") Long id) {
- return AjaxResult.success(technologyOperationParamService.batchDelete(id));
+ @Operation(summary = "鍒犻櫎宸ュ簭鍙傛暟")
+ public R<?> batchDelete(@PathVariable("id") Long id) {
+ return R.ok(technologyOperationParamService.batchDelete(id));
}
}
--
Gitblit v1.9.3