Merge branch 'mater-1.6.0' into div

admin

2019-08-22 a9b7fab63c4345a6b183bffdab1bb0884f4202b5

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

@@ -52,6 +52,12 @@


   

   @Override

   public IntegralTaskClass selectByPrimaryKey(Long id) {

      return integralTaskClassMapper.selectByPrimaryKey(id);

   }

	
	
   @Override

   public List<IntegralTaskClassVO> getIntegralTaskClassVO(Long uid, long start, int count) {

      return integralTaskClassMapper.getIntegralTaskClassVO(start, count);

   }