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-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index f7269a4..cc6337e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -393,7 +393,7 @@
@ApiOperation(value = "按指定类型统计合同数量")
@GetMapping("/productOrderChart")
public ResultBody productOrderChart(@RequestParam Map<String, Object> params) {
- OrderChartVo orderChartVo=productOrderDetailService.productOrderChart(params);
+ List<OrderChartVo> orderChartVo=productOrderDetailService.productOrderChart(params);
return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
}
@@ -405,7 +405,7 @@
@ApiOperation(value = "统计产品的使用数量")
@GetMapping("/proCountChart")
public ResultBody proCountChart() {
- OrderChartVo orderChartVo=productOrderDetailService.proCountChart();
+ List<OrderChartVo> orderChartVo=productOrderDetailService.proCountChart();
return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
}
}
--
Gitblit v1.8.0