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

admin

2020-03-09 8a1878856e4cdd735d03c1cb7cd1576ed5967d1c

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/jd/JDOrderItemMapper.java

@@ -33,5 +33,15 @@
    * @return

    */

   Long countOrderByDay(@Param("preDay") String preDay);

	
   /**

    * 统计所有订单

    * 
    * @param channel

    * @return

    */

   List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,

         @Param("startTime") String startTime, @Param("endTime") String endTime);





}