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

admin

2019-09-03 81f4d5a0074dcc0da71ef453e4e02a4d1d7decf5

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