Merge branch 'div' into div-1

yujian

2020-03-28 393e3a365b5ebbed6e9eef07fbd18881cde73711

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



}