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

admin

2020-02-23 b8134c0133956c67cd94fb4efa036238df2cbe2e

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

@@ -32,7 +32,6 @@
    * @param channel

    * @return

    */

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

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

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



}