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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

 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;

}