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

admin

2019-08-20 4fb3f5e033c38afda6e7db013c53389732591efd

 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java

@@ -87,4 +87,12 @@
    */

   public List<IntegralTaskRecord> listNotReceivedExcludeId(int count, long uid, Set<Long> idList);



   /**

    * 领取所有

    * @param uid

    * @return

    * @throws IntegralTaskRecordException

    */

   public Integer receiveGoldCoinALL(Long uid) throws IntegralTaskRecordException;



}