From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
index 8ad4f02..5f58c0d 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -1,7 +1,7 @@
package com.ruoyi.sales.controller;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.service.impl.MetricStatisticsServiceImpl;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,13 +25,13 @@
@Operation(summary = "澶撮儴鎬昏")
@GetMapping("/total")
- public AjaxResult total() {
+ public R<?> total() {
return metricStatisticsService.total();
}
@Operation(summary = "缁熻琛�")
@GetMapping("/statisticsTable")
- public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
+ public R<?> statisticsTable(StatisticsTableDto statisticsTableDto) {
return metricStatisticsService.statisticsTable(statisticsTableDto);
}
--
Gitblit v1.9.3