Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-27 c833ab8f5968c755ded82eea5e8ce2aca841a0cb

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

   }