From 76640d343082d1473a482e7ba48461db9b26c035 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:36:57 +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/safe/controller/SafeTrainingDetailsController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
index b000680..63a03e4 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
@@ -4,8 +4,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.service.SafeTrainingDetailsService;
-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.springframework.web.bind.annotation.*;
@@ -20,7 +20,7 @@
*/
@RestController
@RequestMapping("/safeTrainingDetails")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
@AllArgsConstructor
public class SafeTrainingDetailsController {
@@ -28,12 +28,12 @@
private final SafeTrainingDetailsService safeTrainingDetailsService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeTrainingDetails safeTrainingDetails) {
return R.ok(safeTrainingDetailsService.pageDetails(page, safeTrainingDetails));
}
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestBody SafeTrainingDetails safeTrainingDetails) {
safeTrainingDetailsService.export(response,safeTrainingDetails.getUserId());
--
Gitblit v1.9.3