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

admin

2019-12-13 fb1d948a7b64cd02083b7b6f7ae18d16ad638609

 fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackGiveRecordService.java

@@ -38,4 +38,12 @@
   public RedPackGiveRecord receiveFriendsGive(Long uid, Long id) throws RedPackGiveRecordException;





   /**

    * 赠送退回

    * @param id

    * @throws Exception

    */

   public void overdueByPrimaryKey(Long id) throws Exception;





}