Merge branch 'dev_2'

yujian

2019-05-14 1823108940bb5fda2d26787236dc5df3004bc0ec

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