Merge branch 'dev1'

Administrator

2018-12-07 3b7a7eb6aa8d857dc9f2e03cd947e8f8482bf14b

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

}