Merge remote-tracking branch 'origin/master'

admin

2019-02-26 4fe5f879c1b2919099a6e193ab4db8d25725ca40

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

@@ -33,5 +33,12 @@
    * @return

    */

   public List<SystemCoupon> getGoodsCouponList();



   /**

    * 根据类型查询

    * @param type

    * @return

    */

   public SystemCoupon getCouponByType(String type);

   

}