From bb0c7d3c6cecdfd04f3a191b59a1b9a8853d69e2 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 15 Jun 2020 16:12:47 +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 | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 4bd077d..a0d0386 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
@@ -9,6 +9,7 @@
import com.kidgrow.oprationcenter.vo.GroupProductDetail;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
+import java.util.List;
import java.util.Map;
/**
@@ -26,12 +27,6 @@
* @return
*/
PageResult<ProductOrderDetail> findList(Map<String, Object> params);
- /**
- * 列表
- * @param params
- * @return
- */
- PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser);
/**
* 诊断列表
@@ -60,5 +55,11 @@
ResultBody updateEnabled(Map<String, Object> params);
ResultBody getTypeByUser(SysUser sysUser);
+ /**
+ * 获取所有的套餐记录数据
+ * @param params
+ * @return
+ */
+ List<ProductOrderJoinDetail> findAllList(Map<String, Object> params);
}
--
Gitblit v1.8.0