Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 0485fe81732a49c91a0c1e8628ad90ca72458e55

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

@@ -52,6 +52,11 @@
   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;



	
   public List<Object>  getWeekBuyRate(String channel, String startTime, String endTime,

         Integer orderNum, List<String> dateList) throws Exception;

}