冲突

yujian

2019-05-09 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22

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