解决冲突

Administrator

2018-12-10 5cdd46435f18f3615919aa5a0b8c6e49c539ef69

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

}