Merge branch 'development' into dev

zhaoxiaohao

2020-11-25 a04d76dc568b4a13455ea6ca4ae2a92e6387736d

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java

@@ -136,5 +136,13 @@
     * @return
     */
    PageResult<ProductEndVo>productEndList(Map<String, Object> params);
   /**
     * 获取一个科室所有的有效套餐
     * @param departmentId
     * hospitalId
     * @return
     */
    int getUserdProduct(Long hospitalId,Long departmentId);

}