Merge branch 'dev1'

Administrator

2018-12-06 1770eb0a01b3f2ef92f416b67d25160d3ced9625

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

}