Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemCouponServiceImpl.java

@@ -54,7 +54,7 @@
   }

   

   @Override

   @Cacheable(value = "systemCouponCache",key="'getOrderCouponList")

   @Cacheable(value = "systemCouponCache",key="'getOrderCouponList'")

   public List<SystemCoupon> getOrderCouponList() {

      List<String> listType = new ArrayList<String>();

      listType.add(CouponTypeEnum.rebatePercentCoupon.name());