From 56b8b84689ccf5389ee02814bcb8bfe407f05a87 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 11:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java
index f730aae..c24c93f 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java
@@ -8,15 +8,15 @@
import com.ruoyi.technology.bean.dto.TechnologyOperationDto;
import com.ruoyi.technology.bean.vo.TechnologyOperationVo;
import com.ruoyi.technology.service.TechnologyOperationService;
-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.*;
import java.util.List;
@RestController
-@Api(tags = "宸ュ簭绠＄悊")
+@Tag(name = "宸ュ簭绠＄悊")
@RequestMapping("/technologyOperation")
@RequiredArgsConstructor
public class TechnologyOperationController {
@@ -25,34 +25,34 @@
@GetMapping("/listPage")
@Log(title = "Technology operation page", businessType = BusinessType.OTHER)
- @ApiOperation("宸ュ簭鍒嗛〉鏌ヨ")
+ @Operation(summary = "宸ュ簭鍒嗛〉鏌ヨ")
public R<IPage<TechnologyOperationVo>> listPage(Page<TechnologyOperationDto> page, TechnologyOperationDto technologyOperationDto) {
return R.ok(technologyOperationService.listPage(page, technologyOperationDto));
}
@PostMapping("/add")
@Log(title = "Add technology operation", businessType = BusinessType.INSERT)
- @ApiOperation("鏂板宸ュ簭")
+ @Operation(summary = "鏂板宸ュ簭")
public R add(@RequestBody TechnologyOperationDto technologyOperationDto) {
return technologyOperationService.add(technologyOperationDto);
}
@PutMapping("/update")
@Log(title = "Update technology operation", businessType = BusinessType.UPDATE)
- @ApiOperation("淇敼宸ュ簭")
+ @Operation(summary = "淇敼宸ュ簭")
public R update(@RequestBody com.ruoyi.technology.pojo.TechnologyOperation technologyOperation) {
return R.ok(technologyOperationService.updateById(technologyOperation));
}
@DeleteMapping("/batchDelete")
@Log(title = "Delete technology operation", businessType = BusinessType.DELETE)
- @ApiOperation("鎵归噺鍒犻櫎宸ュ簭")
+ @Operation(summary = "鎵归噺鍒犻櫎宸ュ簭")
public R batchDelete(@RequestBody List<Long> ids) {
return R.ok(technologyOperationService.batchDelete(ids));
}
@GetMapping("/list")
- @ApiOperation("鏌ヨ鍏ㄩ儴宸ュ簭")
+ @Operation(summary = "鏌ヨ鍏ㄩ儴宸ュ簭")
public R<List<TechnologyOperationVo>> list() {
return R.ok(technologyOperationService.listVo());
}
--
Gitblit v1.9.3