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/inter/integral/IntegralTaskRecordService.java

@@ -109,7 +109,7 @@
    * @param day

    * @return

    */

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

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



   /**

    * 添加获取记录