Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 b63c28a0c24782753eae26892171dd1a0c8d1fe7

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