From be63f61992b0120e0ea6df6657141d0c8e245172 Mon Sep 17 00:00:00 2001 From: 克 刘 <4345453@qq.com> Date: Thu, 20 Aug 2020 12:08:23 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java index 7489bcb..a340b86 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java @@ -105,12 +105,12 @@ * endTime 结束时间 * @return */ - OrderChartVo productOrderChart(@Param("p") Map<String, Object> params); + List<OrderChartVo> productOrderChart(@Param("p") Map<String, Object> params); /** * 统计产品的使用数量 * @return ccount 是数量 * units 是产品名称 */ - OrderChartVo proCountChart(); + List<OrderChartVo> proCountChart(); } -- Gitblit v1.8.0