From f5ee8e7afb178179c1d1d078cf42fe33dc7607f9 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/account/controller/AccountingController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountingController.java b/src/main/java/com/ruoyi/account/controller/AccountingController.java
index 0f0552d..630694e 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountingController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountingController.java
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.service.impl.AccountingServiceImpl;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +16,7 @@
* @author :yys
* @date : 2026/1/17 10:40
*/
-@Api(tags = "浼氳鏍哥畻")
+@Tag(name = "浼氳鏍哥畻")
@RestController
@RequestMapping("/accounting")
@AllArgsConstructor
@@ -25,21 +25,21 @@
private AccountingServiceImpl accountingService;
- @ApiOperation("鎬昏")
+ @Operation(summary = "鎬昏")
@GetMapping("/total")
- public AjaxResult total(@RequestParam Integer year) {
+ public R<?> total(@RequestParam Integer year) {
return accountingService.total(year);
}
- @ApiOperation("璁惧绫诲瀷鍒嗗竷")
+ @Operation(summary = "璁惧绫诲瀷鍒嗗竷")
@GetMapping("/deviceTypeDistribution")
- public AjaxResult deviceTypeDistribution(@RequestParam Integer year) {
+ public R<?> deviceTypeDistribution(@RequestParam Integer year) {
return accountingService.deviceTypeDistribution(year);
}
- @ApiOperation("璁惧鍒嗛〉鏌ヨ璁＄畻鎶樻棫")
+ @Operation(summary = "璁惧鍒嗛〉鏌ヨ璁＄畻鎶樻棫")
@GetMapping("/calculateDepreciation")
- public AjaxResult calculateDepreciation(Page page, @RequestParam Integer year) {
+ public R<?> calculateDepreciation(Page page, @RequestParam Integer year) {
return accountingService.calculateDepreciation(page,year);
}
--
Gitblit v1.9.3