Merge branch 'mater-1.6.0' into div

admin

2019-08-26 1d1c321cdb8905d8c89c26637d36b975c4b12742

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