Merge branch 'div_8'

yujian

2019-05-14 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5

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