From ca81ac257960fcb135fe542a49c28bc871b14e2a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop
---
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