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

yujian

2020-05-19 b7a90c576ac6b482c68ad6d0c2777831f9127b4a

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



}