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;
			@@ -26,7 +27,7 @@

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

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

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

			@ApiModelProperty(value = "编辑人")
			@@ -56,18 +57,32 @@

			@ApiModelProperty(value = "编号")
			@ExcelColumn(name="编号")
			private String code;
			private Integer code;

			@ApiModelProperty(value = "状态 0正常 1异常", example = "1")
			@ExcelColumn(name="状态 0正常 1异常")
			@ApiModelProperty(value = "状态，0闭合, 1打开，2运行中, 3异常", example = "1")
			@ExcelColumn(name="状态，0闭合, 1打开，2运行中, 3异常")
			private Integer status;

			@ApiModelProperty(value = "站点编码(关联sites)")
			@ExcelColumn(name="站点编码(关联sites)")
			private String siteId;

			@ApiModelProperty(value = "站点编码(关联sites)")
			@ExcelColumn(name="站点编码(关联sites)")
			@TableField(select = false)
			private String siteName;

			@ApiModelProperty(value = "当前锁定自行车编号")
			@ExcelColumn(name="当前锁定自行车编号")
			private String bikeCode;

			@ApiModelProperty(value = "当前锁定自行车编号")
			@ExcelColumn(name="当前锁定自行车类型")
			@TableField(select = false)
			private String bikeType;

			@ApiModelProperty(value = "当前锁定自行车编号")
			@TableField(exist = false)
			private Sites sites;

			}