From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3
---
src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java b/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java
index a53178a..b94025a 100644
--- a/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java
+++ b/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java
@@ -37,14 +37,14 @@
@GetMapping("/sale/page")
@ApiOperation(value = "查询-分页", notes = "查询-分页")
public ResponseEntity<ReturnDataDTO<Page<OrderReportResultVO>>> page(
- Page page, QueryOrderDTO dto
+ Page page,@Validated QueryOrderDTO dto
) {
return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(orderReportService.getSalePage(page,dto), OrderReportResultVO.class));
}
@GetMapping("/sale/statis")
@ApiOperation(value = "统计", notes = "统计")
- public ResponseEntity<ReturnDataDTO<OrderReportResultVO>> statis(QueryOrderDTO dto
+ public ResponseEntity<ReturnDataDTO<OrderReportResultVO>> statis(@Validated QueryOrderDTO dto
) {
return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(orderReportService.getSaleStatis(dto), OrderReportResultVO.class));
}
@@ -52,7 +52,7 @@
@GetMapping({"/sale/export"})
@ApiOperation(value = "报告列表导出")
- public void exportSales(HttpServletResponse response, QueryOrderDTO dto){
+ public void exportSales(HttpServletResponse response,@Validated QueryOrderDTO dto){
orderReportService.exportSalesList(response, dto);
}
--
Gitblit v1.9.3