Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-27 b2cff7a3e9d5cebacef4866c5993e0be89ff5b00

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

@@ -301,4 +301,12 @@
    */

   public long countUsableRewardCoupon(Long uid);



   /**

    * 查询免券数量

    * @param uid

    * @param type

    * @return

    */

   public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type);



}