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

admin

2019-10-25 14f8255006245ab8473d3b0c755e76f9e9b8148f

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



   /**

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