Merge branch 'div1'

yujian

2019-01-14 79ceb6d830499561abc1e86d976ca10ccd1fd7ed

 fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java

@@ -49,5 +49,9 @@
    * 统计新增用户

    * @return

    */

   public List<Map<String, Object>> countNewUserByDate(Integer type,String years, String startTime, String endTime) throws Exception;

   public List<Map<String, Object>> countNewUserByDate(String channel,Integer type,String years, String startTime, String endTime) throws Exception;



	
   public List<Map<String, Object>> getTodayBuyRate(String channel, Integer type, String years, String startTime,

         String endTime) throws Exception;

}