Merge remote-tracking branch 'origin/master'

admin

2019-01-28 e52789b7e099f6e8f10543afbc4f9010b5e94e1a

 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;

}