Merge remote-tracking branch 'origin/master'

admin

2018-12-06 488133e4a2b82014537a555882f33c2319b3193d

 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java

@@ -617,4 +617,9 @@
   public int updateByPrimaryKey(RecommendActivity record) {

      return recommendActivityMapper.updateByPrimaryKey(record);

   }



   @Override

   public ActivityUser selectActivityUserByPrimaryKey(Long id) {

      return activityUserMapper.selectByPrimaryKey(id);

   }

}