Merge branch 'dev-resources-20181116' into test6.8.2

@@ -28,8 +28,8 @@ public class Coupon implements Serializable {
     /**商品限制条件-特定商品*/
     public static final int PRODUCTLIMITTYPE_SPECIALPRODUCT = 1;
     public enum CouponStatusEnum {
-        //0:待审核,1:有效,2:审核驳回,3:作废
-        WAITE_CHECK(0,"待审核"),IN_EFFECT(1,"有效"),REVIEW_REJECTION(2,"审核驳回"),INVALID(3,"作废");
+        //0:未生效,1:生效中,2:已过期,3:已作废
+        WAITE_CHECK(0,"未生效"),IN_EFFECT(1,"生效中"),REVIEW_REJECTION(2,"已过期"),INVALID(3,"已作废");
         private int value;
         private String key;