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

admin

2020-05-18 f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72

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

@@ -149,4 +149,9 @@
    */

   List<IntegralTaskRecord> listByUidAndTaskId(@Param("uid") Long uid, @Param("taskId") Long taskId,

         @Param("start") long start, @Param("count") int count);

	
   /**

    * 更新金币失效

    */

   void invalidGoldCoin();

}