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

admin

2019-09-02 34b542007f7e0dd4e1fdffecbd12a377aa953d68

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

@@ -68,7 +68,7 @@
      List<String> listType = new ArrayList<String>();

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

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

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

      return systemCouponMapper.getCouponListByType(listType);

   }