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

admin

2019-08-26 4f0197ad8aeb2dd13929d2f656d80265263775ed

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java

@@ -23,8 +23,8 @@
    * @param channel
    * @return
    */
   List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year, 
         @Param("startTime")String startTime, @Param("endTime")String endTime);
   List<Map<String, Object>> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year, 
         @Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceType") int sourceType);

   
   /**