Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

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