diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql index 49d34b0bb..1569c109c 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql @@ -4,5 +4,5 @@ add column `activity_time` datetime COMMENT '活动时间', add column `use_credit` smallint(2) DEFAULT 0 COMMENT '使用积分1是0否', add column `credit` int(11) DEFAULT 0 COMMENT '消耗积分', add column `question` json NOT NULL COMMENT '问题', -add column `is_expired` smallint(2) DEFAULT 0 COMMENT '是否过期1是0否', +add column `is_expired` smallint(2) DEFAULT 1 COMMENT '是否过期1是0否', add column `activity_type` smallint(2) DEFAULT 1 COMMENT '活动类型1直接投放2限时投放'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 3e2f96bf7..613980c68 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -8,7 +8,6 @@ import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -75,6 +74,21 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="富文本",name="html") private String html; + @io.swagger.annotations.ApiModelProperty(value = "报名人数", name = "personLimit") + private Integer personLimit; + @io.swagger.annotations.ApiModelProperty(value = "活动时间", name = "activityTime") + private Date activityTime; + @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit") + private Integer useCredit; + @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") + private Integer credit; + @io.swagger.annotations.ApiModelProperty(value = "问题", name = "question") + private String question; + @io.swagger.annotations.ApiModelProperty(value = "是否过期1是0否", name = "isExpired") + private Integer isExpired; + @io.swagger.annotations.ApiModelProperty(value = "活动类型1直接投放2限时投放", name = "activityType") + private Integer activityType; + @Transient @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") protected String weappPath;