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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 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;

}