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

admin

2020-02-26 a276635f2b82e5ee653275024d6211f7132df9a1

 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);



}