From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/oA/controller/OaProjectController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/oA/controller/OaProjectController.java b/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
index 67cbcaf..b7ecc7a 100644
--- a/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
+++ b/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
@@ -6,8 +6,8 @@
import com.ruoyi.oA.dto.OaProjectDto;
import com.ruoyi.oA.pojo.OaProject;
import com.ruoyi.oA.service.OaProjectService;
-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 jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
@@ -16,20 +16,20 @@
import java.util.HashMap;
import java.util.List;
-@Api(tags = "oA椤圭洰绠＄悊")
+@Tag(name = "oA椤圭洰绠＄悊")
@RestController
@AllArgsConstructor
@RequestMapping("/oA/project")
public class OaProjectController {
private final OaProjectService oaProjectService;
- @ApiOperation("鑾峰彇椤圭洰鍒楄〃")
+ @Operation(summary = "鑾峰彇椤圭洰鍒楄〃")
@GetMapping("/listPage")
public AjaxResult listPage(Page page, OaProjectDto oaProjectDto) {
IPage<OaProjectDto> listPage = oaProjectService.listPage(page, oaProjectDto);
return AjaxResult.success(listPage);
}
- @ApiOperation("鑾峰彇椤圭洰鍒楄〃璇︽儏")
+ @Operation(summary = "鑾峰彇椤圭洰鍒楄〃璇︽儏")
@GetMapping("/getList")
public AjaxResult getList(Page page, OaProjectDto oaProjectDto) {
IPage<OaProjectDto> listPage = oaProjectService.listPage(page, oaProjectDto);
@@ -39,31 +39,31 @@
});
return AjaxResult.success(Map);
}
- @ApiOperation("澧炴坊椤圭洰")
+ @Operation(summary = "澧炴坊椤圭洰")
@PostMapping("/add")
public AjaxResult add(@RequestBody OaProject oaProject) {
boolean save = oaProjectService.save(oaProject);
return AjaxResult.success(save);
}
- @ApiOperation("鍒犻櫎椤圭洰")
+ @Operation(summary = "鍒犻櫎椤圭洰")
@DeleteMapping("/delete/{id}")
public AjaxResult delete(@PathVariable Long id) {
boolean remove = oaProjectService.deleteById(id);
return AjaxResult.success(remove);
}
- @ApiOperation("鏇存柊椤圭洰")
+ @Operation(summary = "鏇存柊椤圭洰")
@PostMapping("/update")
public AjaxResult update(@RequestBody OaProject oaProject) {
boolean update = oaProjectService.updateById(oaProject);
return AjaxResult.success(update);
}
-// @ApiOperation("鏍规嵁ID鑾峰彇椤圭洰璇︽儏")
+// @Operation(summary = "鏍规嵁ID鑾峰彇椤圭洰璇︽儏")
// @GetMapping("/getById")
// public AjaxResult getById(Long id) {
// OaProject oaProject = oaProjectService.getById(id);
// return AjaxResult.success(oaProject);
// }
- @ApiOperation("瀵煎嚭鎵�閫夐」鐩�")
+ @Operation(summary = "瀵煎嚭鎵�閫夐」鐩�")
@PostMapping("/export/{ids}")
public void export(HttpServletResponse response, @PathVariable("ids") List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
--
Gitblit v1.9.3