Merge remote-tracking branch 'origin/master'

admin

2019-01-14 325009946e7c987c4b087509ffef5087f8b3d09a

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java

@@ -32,8 +32,8 @@
    * @param channel

    * @return

    */

   public List<Object> countSameDayByChannel(String channel, Integer type, String years, String startTime, String endTime)

         throws Exception;

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

   /**

    * 根据渠道   统计当日新增用户有购买行为的数量

    * @param channel