From 1823108940bb5fda2d26787236dc5df3004bc0ec Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 10:41:30 +0800
Subject: [PATCH] Merge branch 'dev_2'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
index f37ab40..3c5ac36 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
+++ b/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) {
--
Gitblit v1.8.0