From 0381d6fdd6831eb0abdd8bdd90a4a6a7b6e9026c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 十二月 2024 10:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java
index 9e51514..f2a9aae 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Data
@@ -46,15 +47,5 @@
@ApiModelProperty(value = "单品类型订单总金额")
private Double singleTotalMoney;
- /**
- * 服务类型订单数量map(key:日期，value:数量)
- */
- @ApiModelProperty(value = "服务类型订单数量map(key:日期，value:数量)")
- private Map<String, Integer> serviceOrderMap;
-
- @ApiModelProperty(value = "单品类型订单数量map(key:日期，value:数量)")
- private Map<String, Integer> singleOrderMap;
-
- @ApiModelProperty(value = "订单总数map(key:日期，value:数量)")
- private Map<String, Integer> totalOrderMap;
+ private List<OrderStatisticsDetail> orderStatisticsDetailList;
}
--
Gitblit v1.7.1