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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -303,9 +303,9 @@
   }



   @Override

   public Integer countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {

   public int countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {

      if (day == null)

         return null;

         return 0;

      Date minTime = new Date(

            TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(day.getTime(), "yyyy-MM-dd"), "yyyy-MM-dd"));

      Date maxTime = new Date(minTime.getTime() + 1000 * 60 * 60 * 24L);