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

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

 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;





}