Merge remote-tracking branch 'origin/master'

liuke

2020-12-11 e80adff2cfff2fa9d29aff9e5a7f2feb52681ef8

 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);

}