Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

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