|
@@ -4,22 +4,19 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
|
import com.baomidou.mybatisplus.annotation.TableName;
|
|
|
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
|
|
|
+import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
import com.yonge.cooleshow.common.enums.RewardTypeEnum;
|
|
|
import com.yonge.cooleshow.common.enums.UnitEnum;
|
|
|
import io.swagger.annotations.ApiModel;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
-
|
|
|
-import java.io.Serializable;
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.util.Date;
|
|
|
-import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
|
|
import javax.validation.constraints.NotBlank;
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
-import javax.validation.constraints.Positive;
|
|
|
import javax.validation.constraints.PositiveOrZero;
|
|
|
+import java.io.Serializable;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -63,9 +60,6 @@ public class ActivityReward implements Serializable {
|
|
|
@ApiModelProperty("数量(每个奖品) ")
|
|
|
@TableField(value = "num_")
|
|
|
private Integer num;
|
|
|
- @ApiModelProperty("优惠金额 ")
|
|
|
- @TableField(value = "discount_price_")
|
|
|
- private Double discountPrice;
|
|
|
@ApiModelProperty("单位 DAY 天 MONTH 月 YEAR 年")
|
|
|
@TableField(value = "unit_")
|
|
|
private UnitEnum unit;
|
|
@@ -221,11 +215,4 @@ public class ActivityReward implements Serializable {
|
|
|
this.updateBy = updateBy;
|
|
|
}
|
|
|
|
|
|
- public Double getDiscountPrice() {
|
|
|
- return discountPrice;
|
|
|
- }
|
|
|
-
|
|
|
- public void setDiscountPrice(Double discountPrice) {
|
|
|
- this.discountPrice = discountPrice;
|
|
|
- }
|
|
|
}
|