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

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

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

   

}