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/dao/mybatis/integral/IntegralTaskRecordMapper.java

@@ -95,5 +95,5 @@
    * @param uid

    * @return

    */

   int countByTaskIdTodayNum(@Param("uid") Long uid, @Param("tid") Long tid, @Param("date") Date date);

   int countByTaskIdTodayNum(@Param("uid") Long uid, @Param("tid") Long tid, @Param("date") String date);

}