Merge branch 'dev1'

Administrator

2018-12-07 3b7a7eb6aa8d857dc9f2e03cd947e8f8482bf14b

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

   }

}