From 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 19:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 96b7ef4..05d2505 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -19,8 +19,8 @@
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ISalesLedgerService;
-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 io.swagger.annotations.ApiParam;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
@@ -47,7 +47,7 @@
@RestController
@RequestMapping("/sales/ledger")
@AllArgsConstructor
-@Api(tags = "閿�鍞彴璐�")
+@Tag(name = "閿�鍞彴璐�")
@Slf4j
public class SalesLedgerController extends BaseController {
@@ -61,14 +61,14 @@
*/
@Log(title = "瀵煎叆閿�鍞彴璐�", businessType = BusinessType.INSERT)
@PostMapping("/import")
- @ApiOperation("瀵煎叆閿�鍞彴璐�")
+ @Operation(summary = "瀵煎叆閿�鍞彴璐�")
public AjaxResult importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return salesLedgerService.importData(file);
}
- @ApiOperation("瀵煎嚭閿�鍞彴璐︽ā鏉�")
+ @Operation(summary = "瀵煎嚭閿�鍞彴璐︽ā鏉�")
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
// 1. 妯℃澘鏂囦欢鍦╮esources/static涓嬬殑璺緞
@@ -338,7 +338,7 @@
return iPage;
}
- @ApiOperation("鏌ヨ閿�鍞彴璐︽秷鑰楃墿鏂欎俊鎭�")
+ @Operation(summary = "鏌ヨ閿�鍞彴璐︽秷鑰楃墿鏂欎俊鎭�")
@GetMapping("/getSalesLedgerWithProductsLoss")
public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
--
Gitblit v1.9.3