Merge remote-tracking branch 'origin/master'

Administrator

2018-11-22 286e7a9b9632087798fbcd7b0a63b12d2a458235

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

@@ -44,6 +44,7 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.activity.ActivityUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.QRCodeUtil;

import org.yeshi.utils.entity.FileUploadResult;

@@ -591,4 +592,29 @@


      return activity;

   }



   @Override

   public int insert(RecommendActivity record) {

      return recommendActivityMapper.insert(record);

   }



   @Override

   public int insertSelective(RecommendActivity record) {

      return recommendActivityMapper.insertSelective(record);

   }



   @Override

   public RecommendActivity selectByPrimaryKey(Long id) {

      return recommendActivityMapper.selectByPrimaryKey(id);

   }



   @Override

   public int updateByPrimaryKeySelective(RecommendActivity record) {

      return recommendActivityMapper.updateByPrimaryKeySelective(record);

   }



   @Override

   public int updateByPrimaryKey(RecommendActivity record) {

      return recommendActivityMapper.updateByPrimaryKey(record);

   }

}