Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-08-08 4d9483cecdeb9e13a7ea4475121351b02058a51b

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java

@@ -68,7 +68,7 @@
    /**
     * 按指定类型统计合同数量
     * @param params
     *    datatype      1 按年
     *    datatype     1 按年
     *                 2 按月
     *                 3 按天
     *                 4 按周
@@ -77,4 +77,11 @@
     * @return
     */
    OrderChartVo productOrderChart(@Param("p") Map<String, Object> params);

    /**
     * 统计产品的使用数量
     * @return  ccount 是数量
     *          units 是产品名称
     */
    OrderChartVo proCountChart();
}