From e80adff2cfff2fa9d29aff9e5a7f2feb52681ef8 Mon Sep 17 00:00:00 2001 From: liuke <123456> Date: Fri, 11 Dec 2020 18:34:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 3 ++- 1 files changed, 2 insertions(+), 1 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 57353ef..066ea2b 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 @@ -130,7 +130,7 @@ * @param params * @return */ - PageResult<ProductOrderDetail> departmentProductDetail(Map<String, Object> params); + PageResult<ProductOrderDetailVo> departmentProductDetail(Map<String, Object> params); /** * 获取最近即将到期的套餐 * @return @@ -143,5 +143,6 @@ * @return */ int getUserdProduct(Long hospitalId,Long departmentId); + } -- Gitblit v1.8.0