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

admin

2019-12-18 84ab5704aee0df06d0352ab67d1fa671ac284c8b

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

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

   public void sendBackByGiveId(Long giveid);



   /**

    * 统计赠送免单券

    * @param uid

    * @return

    */

   public long countGiveFreeCoupon(Long uid);



}