Merge branch 'dev_1'

yujian

2019-05-14 236b8cd939e9c161d5410f530f9539df7ebba484

 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();