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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

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

@@ -61,6 +61,18 @@
   List<IntegralTaskRecord> listDaySignRecord(@Param("uid") Long uid, @Param("cid") Long cid);



   /**

    * 近7天签到情况

    * 
    * @param uid

    * @param cid

    * @param sortState

    *            1倒序-创建时间

    * @return

    */

   List<IntegralTaskRecord> listSignRecordByDateTime(@Param("uid") Long uid, @Param("cid") Long cid, @Param("dateTime") String dateTime);



	
   /**

    * 未领取金币

    * 

    * @param count