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

yujian

2019-09-25 3c1f04d76fdd1f60bd78696f8a1aac6dafbbb543

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java

@@ -118,7 +118,8 @@
    * @param uid

    * @return

    */

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

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

         @Param("recordId") Long recordId);



   /**

    * 根据类型与创建时间检索