From a98bb3c923b1a055703cca9049364a2fc79eefe0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 10 Aug 2020 18:23:49 +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/impl/ProductOrderDetailServiceImpl.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/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index c3d4ead..107c6e6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -158,7 +158,7 @@
      * @return
              */
     @Override
-    public OrderChartVo productOrderChart(Map<String, Object> params) {
+    public List<OrderChartVo> productOrderChart(Map<String, Object> params) {
         return baseMapper.productOrderChart(params);
     }
     /**
@@ -167,7 +167,7 @@
      *          units 是产品名称
      */
     @Override
-    public OrderChartVo proCountChart() {
+    public List<OrderChartVo> proCountChart() {
         return baseMapper.proCountChart();
     }
 

--
Gitblit v1.8.0