Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-23 ac8e9b9d4e5f15369c1c1df49c63378fb1ae6f7b

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

   }

@@ -153,8 +159,10 @@
         String before = format.format(listDays.get(i));

         if (before.startsWith("0")) 

            before = before.substring(1, before.length());

			
         SignDateVO signDateVO = new SignDateVO();

         signDateVO.setDate(before);

         signDateVO.setLightUp(true);

         listSign.add(signDateVO);

      }