Merge remote-tracking branch 'origin/div' into div

admin

2019-08-22 0753e8e2febe83f13d9d7a6071fa5f7b57d7d7f1

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

}