From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java index 9af0e59..3997c52 100644 --- a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java +++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java @@ -22,7 +22,7 @@ // 鍒哥被鍨� public enum CouponTypeEnum { - freeCoupon("鍏嶅崟鍒�"), welfareFreeCoupon("绂忓埄鍏嶅崟"), rebatePercentCoupon("杩斿埄姣旀彁鎴愬鍔卞埜"), + freeCoupon("鑷喘鍏嶅崟鍒�"), welfareFreeCoupon("绂忓埄鍏嶅崟"), rebatePercentCoupon("杩斿埄姣旀彁鎴愬鍔卞埜"), freeCouponBuy("鑷喘鍏嶅崟鍒�"),freeCouponGive("璧犻�佸厤鍗曞埜"); private final String desc; -- Gitblit v1.8.0