productDev/parkBike.git

			@@ -19,14 +19,12 @@
			@ApiModel("节假日配置表")
			@TableName("\"holidays\"")
			public class Holidays {

			@ApiModelProperty(value = "编码")
			@ExcelColumn(name="编码")
			private String id;

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

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

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

			@ApiModelProperty(value = "编辑人")
			@@ -50,9 +47,7 @@
			@ExcelColumn(name="备注")
			private String info;

			@ApiModelProperty(value = "日期")
			@ApiModelProperty(value = "日期,格式yyyy-MM-DD")
			@ExcelColumn(name="日期")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date holiday;

			private String holiday;
			}