Merge branch 'master' of ssh://yujian@193.112.35.168:29418/fanli-server.git

Administrator

2018-12-06 3f9235e7f989708f576f0d807de9714418e1bd2b

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

   }

}