productDev/parkBike.git

			@@ -15,6 +15,9 @@
			@ApiModel("骑行记录返回")
			public class MemberRidesDTO {

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

			@ApiModelProperty(value = "用户OpenID")
			@ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
			private String openid;
			@@ -31,7 +34,7 @@
			private Integer closeStatus;

			@ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车 3开锁失败")
			@ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
			// @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
			private Integer status;

			@ApiModelProperty(value = "骑行时长")
			@@ -42,12 +45,26 @@
			@ExcelColumn(name="计费时长（分)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
			private Integer duration;

			@ApiModelProperty(value = "租车时间"))
			@ExcelColumn(name="租车时间",index = 8,width = 10,align = HorizontalAlignment.CENTER)
			@ApiModelProperty(value = "租车时间")
			@ExcelColumn(name="租车时间",index = 8,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
			private Date rentDate;

			@ApiModelProperty(value = "还车时间")
			@ExcelColumn(name="还车时间",index = 9,width = 10,align = HorizontalAlignment.CENTER)
			@ExcelColumn(name="还车时间",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
			private Date backDate;

			@ApiModelProperty(value = "租车站点编码")
			private String rentSiteId;

			@ApiModelProperty(value = "租车锁头编码")
			private String rentLockId;


			@ApiModelProperty(value = "还车站点编码")
			// @ExcelColumn(name="归还站点",index = 7,width = 10,align = HorizontalAlignment.CENTER)
			private String backSiteId;

			@ApiModelProperty(value = "还车锁头编码")
			// @ExcelColumn(name="归还锁具",index = 8,width = 10,align = HorizontalAlignment.CENTER)
			private String backLockId;
			}