Merge remote-tracking branch 'origin/div' into div

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskServiceImpl.java

@@ -16,6 +16,12 @@
   @Resource

   private IntegralTaskMapper integralTaskMapper;



	
   @Override

   public IntegralTask selectByPrimaryKey(Long id) {

      return integralTaskMapper.selectByPrimaryKey(id);

   }

	
   @Override

   public List<IntegralTask> listByCid(Long cid) {

      return integralTaskMapper.listByCid(cid);