Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

 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);

   
   /**