Merge branch 'dev_4'

yujian

2019-05-14 b1f7380b94ff1189759ed14b563fed6534f73ab0

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java

@@ -511,7 +511,7 @@
         prize = "NoPrize";

      } else if (prize.equals(couponType)) {

         // 已存在此券

			
         prize = "NoPrize";

      } else { 

         SystemCoupon coupon = systemCouponService.getCouponByType(prize);

         if (coupon != null) {