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

admin

2019-11-13 772c048171cb9b3fdc7e05b711d28458ef3e7543

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java

@@ -332,4 +332,10 @@
    */

   public void triggerFreeCouponActivate(Long uid);



   /**

    * 退回券

    * @param giveid

    */

   public void sendBackByGiveId(Long giveid);



}