Merge remote-tracking branch 'origin/master'

Administrator

2018-12-10 94c29daf7cb722635c1735e8d8bd403105e999d8

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

@@ -235,4 +235,5 @@
   

   public RecommendActivity getRecommendActivityDetail(Long activityId);



   public ActivityUser selectActivityUserByPrimaryKey(Long id);

}