From 086adfdf1d5340a3503da5b5ebcae9073775450e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 十二月 2024 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java b/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
index c8eb798..da1e45e 100644
--- a/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
+++ b/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
@@ -51,7 +51,7 @@
@ApiOperation(value = "花材统计-统计", notes = "花材统计统计")
public ResponseEntity<ReturnDataDTO<FlowerMaterialStaticVO>> getFlowerMaterialStatis(@Validated FlowerMaterialDTO dto
) {
- return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerMaterialStatis(dto), FlowerSaleStatisticVO.class));
+ return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerMaterialStatis(dto), FlowerMaterialStaticVO.class));
}
--
Gitblit v1.9.3