Merge remote-tracking branch 'origin/master'

admin

2019-01-28 e52789b7e099f6e8f10543afbc4f9010b5e94e1a

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

@@ -1,7 +1,5 @@
package com.yeshi.fanli.service.inter.user;



import java.util.List;



import com.yeshi.fanli.entity.bus.user.UserActiveLog;



/**

@@ -25,9 +23,5 @@
    * @return

    */

   public UserActiveLog getUserLatestActiveInfo(Long uid);





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

         throws Exception;



}