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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

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

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

   public void sendBackGiveUser(Long uid);



   /**

    * 统计可使用的免单券

    * @param uid

    * @return

    */

   public long countUsableFreeCouponForBuy(Long uid);



}