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

admin

2019-09-26 f38e508d334ae03024f0dce0d1fb6baed212dc24

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



}