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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 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;





}