From 9d16e9a5cffc2258743180b28be16b761e5d2e47 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Jun 2019 15:47:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxActivity.java | 2 +- .../java/com/iformall/enums/EnumActivityStatus.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 60555afc6..c9b9db448 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -55,7 +55,7 @@ public class WxActivity extends BaseEntity { private Date endTime; @io.swagger.annotations.ApiModelProperty(value = "类型 1固定格式2自由图文", name = "type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value = "0上线 1下线", name = "status") + @io.swagger.annotations.ApiModelProperty(value = "0已保存 1已下线 2已投放", name = "status") private Integer status; @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java index 08f18e6d0..d97f28f98 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java @@ -1,15 +1,14 @@ package com.iformall.enums; + /** - * Created by Stormeye on 2018/08/09. + * @author gongbiao */ public enum EnumActivityStatus { - // 0-已上架;1-已下架; - - STATUS_THROW_IN(0, "已上架"), - STATUS_TAKE_OFFF(1, "已下架"), - INJECT_CAMPAIGN(2, "投放到宣传页"),; + STATUS_THROW_IN(0, "已保存"), + STATUS_TAKE_OFFF(1, "已下线"), + INJECT_CAMPAIGN(2, "已投放"),; public static EnumActivityStatus getEnum(Integer code) { for (EnumActivityStatus value : values()) {