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

Administrator

2020-03-01 666e5d4bae10a7082823bfbe91d0fa7e51f5ad2d

 fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemCouponService.java

@@ -49,5 +49,11 @@
    * @return

    */

   public SystemCoupon getCouponByTypeAndPercent(String type, BigDecimal percent);



   /**

    * 赠送免单券

    * @return

    */

   public List<SystemCoupon> getGiveFreeCouponList();

   

}