From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/account/controller/AccountingController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountingController.java b/src/main/java/com/ruoyi/account/controller/AccountingController.java
index 4688942..630694e 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountingController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountingController.java
@@ -3,7 +3,7 @@
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 com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -27,19 +27,19 @@
@Operation(summary = "鎬昏")
@GetMapping("/total")
- public AjaxResult total(@RequestParam Integer year) {
+ public R<?> total(@RequestParam Integer year) {
return accountingService.total(year);
}
@Operation(summary = "璁惧绫诲瀷鍒嗗竷")
@GetMapping("/deviceTypeDistribution")
- public AjaxResult deviceTypeDistribution(@RequestParam Integer year) {
+ public R<?> deviceTypeDistribution(@RequestParam Integer year) {
return accountingService.deviceTypeDistribution(year);
}
@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