Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/issue/CouponStatus.java

@@ -10,9 +10,9 @@ public enum CouponStatus {
     //待领取、领取后待激活、已激活待使用、已使用、已过期
 
     WAIT_GET("待领取",0),
-    WAIT_ACTIVATED("待激活",1),
-    WAIT_USE("待使用",2),
-    USED("已使用",3),
+    WAIT_ACTIVATED("已领取",1),
+//    WAIT_USE("待使用",2),
+//    USED("已使用",3),
     EXPIRED("已过期",4),
     ;