Merge remote-tracking branch 'origin/master'

admin

2019-04-29 884196860ac5970eb1ac33386c65378284df4679

 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java

@@ -159,7 +159,7 @@
    * 

    * @return

    */

   public long getRecommendActivityCount();

   public long getRecommendActivityCount(String title);



   

   public long getRecommendActivityCountCache();