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

admin

2020-05-18 f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72

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

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

   public List<IntegralTaskRecord> getSign7DaysRecord(long uid, Long cid);



   /**

    * 金币过期

    */

   public void invalidGoldCoin();



}