Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

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