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

admin

2020-05-13 60a099a7edfd81a3b10c766e113c019cdef6cd3d

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

   

}