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

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

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

@@ -187,10 +187,8 @@
   public List<IntegralTaskRecord> getSign7DaysRecord(long uid, Long cid);



   /**

    * 统计总金币

    * @param uid

    * @return

    * 金币过期

    */

   public long getTotalGoldCoinByUid(Long uid);

   public void invalidGoldCoin();



}