productDev/parkBike.git

			@@ -1,5 +1,6 @@
			package com.doumee.dao.business.model;

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.doumee.core.annotation.excel.ExcelColumn;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -8,6 +9,10 @@
			import com.baomidou.mybatisplus.annotation.TableName;
			import lombok.Data;
			import com.fasterxml.jackson.annotation.JsonFormat;

			import javax.validation.constraints.NotBlank;
			import javax.validation.constraints.NotEmpty;
			import java.math.BigDecimal;
			import java.util.Date;

			/**
			@@ -26,7 +31,7 @@

			@ApiModelProperty(value = "创建时间")
			@ExcelColumn(name="创建时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date createDate;

			@ApiModelProperty(value = "创建人")
			@@ -35,7 +40,7 @@

			@ApiModelProperty(value = "编辑时间")
			@ExcelColumn(name="编辑时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date editDate;

			@ApiModelProperty(value = "编辑人")
			@@ -48,19 +53,26 @@

			@ApiModelProperty(value = "定价方案编码(关联price_param)")
			@ExcelColumn(name="定价方案编码(关联price_param)")
			@NotBlank(message = "定价方案编码不允许为空")
			private String pricePramId;

			@ApiModelProperty(value = "车辆类型编码(关联bike_types表）")
			@ExcelColumn(name="车辆类型编码(关联bike_types表）")
			@NotBlank(message = "车辆类型不允许为空")
			private String bikeTypeId;

			@ApiModelProperty(value = "车辆类型编码(关联bike_types表）")
			@ExcelColumn(name="车辆类型编码(关联bike_types表）")
			@TableField(exist = false)
			private String bikeTypeName;

			@ApiModelProperty(value = "工作日起步时间（分钟）", example = "1")
			@ExcelColumn(name="工作日起步时间（分钟）")
			@ExcelColumn(name="工作日起步时间（分钟） -1 表示一口价")
			private Integer baseTime;

			@ApiModelProperty(value = "工作日起步价格（分）", example = "1")
			@ExcelColumn(name="工作日起步价格（分）")
			private Integer basePrice;
			private BigDecimal basePrice;

			@ApiModelProperty(value = "工作日超出时间（分钟）", example = "1")
			@ExcelColumn(name="工作日超出时间（分钟）")
			@@ -68,7 +80,7 @@

			@ApiModelProperty(value = "工作日超出价格（分）", example = "1")
			@ExcelColumn(name="工作日超出价格（分）")
			private Integer unitPrice;
			private BigDecimal unitPrice;

			@ApiModelProperty(value = "节假日起步时间（分钟）", example = "1")
			@ExcelColumn(name="节假日起步时间（分钟）")
			@@ -76,7 +88,7 @@

			@ApiModelProperty(value = "节假日起步价格（分）", example = "1")
			@ExcelColumn(name="节假日起步价格（分）")
			private Integer holidayBasePrice;
			private BigDecimal holidayBasePrice;

			@ApiModelProperty(value = "节假日超出时间（分钟）", example = "1")
			@ExcelColumn(name="节假日超出时间（分钟）")
			@@ -84,7 +96,7 @@

			@ApiModelProperty(value = "节假日超出时间单价（分）", example = "1")
			@ExcelColumn(name="节假日超出时间单价（分）")
			private Integer holidayUnitPrice;
			private BigDecimal holidayUnitPrice;

			@ApiModelProperty(value = "备注")
			@ExcelColumn(name="备注")
			@@ -94,4 +106,9 @@
			@ExcelColumn(name="规则名称")
			private String title;

			@ApiModelProperty(value = "排序码（升序）", example = "1")
			@ExcelColumn(name="排序码（升序）")
			@TableField(exist = false)
			private Integer sortnum;

			}