Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/bean/coupon/CouponVO.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.CouponCrowdEnum;
+import com.gree.mall.manager.enums.CouponStatusEnum;
 import com.gree.mall.manager.enums.CouponTypeEnum;
 import com.gree.mall.manager.enums.CouponUseTypeEnum;
 import com.gree.mall.manager.plus.entity.Coupon;
@@ -56,8 +57,8 @@ public class CouponVO  {
     @ApiModelProperty(value = "显示时间")
     private Date displayTime;
 
-    @ApiModelProperty(value = "标志 WAIT=待发布 START=进行中 END=结束 CANCEL=取消")
-    private String flag;
+    @ApiModelProperty(value = "状态")
+    private CouponStatusEnum flag;
 
     @ApiModelProperty(value = "优惠券领取开始时间")
     private Date obtainStartTime;

src/main/java/com/gree/mall/manager/enums/CouponStatusEnum.java

@@ -12,9 +12,10 @@ import lombok.RequiredArgsConstructor;
 @Getter
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public enum CouponStatusEnum implements BaseEnum {
-    WAIT("WAIT","待审核"),
-    FAIL("FAIL","驳回"),
-    OK("OK","通过");
+    WAIT("WAIT","待发布"),
+    START("START","进行中"),
+    CANCEL("CANCEL","取消"),
+    END("END","结束");
 
     @EnumValue
     @JsonValue