productDev/parkBike.git

			@@ -1,11 +1,9 @@
			package com.doumee.dao.business.model;

			import com.baomidou.mybatisplus.annotation.*;
			import com.doumee.core.annotation.excel.ExcelColumn;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import lombok.Data;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import java.util.Date;
			@@ -27,7 +25,7 @@

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

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

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

			@ApiModelProperty(value = "编辑人")
			@@ -45,6 +43,7 @@

			@ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
			@ExcelColumn(name="是否已删除 0未删除 1已删除")
			@TableLogic
			private Integer isdeleted;

			@ApiModelProperty(value = "备注")
			@@ -54,6 +53,12 @@
			@ApiModelProperty(value = "用户编码")
			@ExcelColumn(name="用户编码")
			private String memberId;

			@ApiModelProperty(value = "用户OpenId")
			@ExcelColumn(name="用户OpenId")
			@TableField(exist = false)
			private String memberOpenid;


			@ApiModelProperty(value = "车辆编码")
			@ExcelColumn(name="车辆编码")
			@@ -67,6 +72,11 @@
			@ExcelColumn(name="车辆类型编码")
			private String paramId;

			@ApiModelProperty(value = "车辆类型名称")
			@ExcelColumn(name="车辆类型名称")
			@TableField(exist = false)
			private String paramName;

			@ApiModelProperty(value = "租车站点编码")
			@ExcelColumn(name="租车站点编码")
			private String rentSiteId;
			@@ -77,7 +87,7 @@

			@ApiModelProperty(value = "租车时间")
			@ExcelColumn(name="租车时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date rentDate;

			@ApiModelProperty(value = "租车指令编码")
			@@ -94,7 +104,7 @@

			@ApiModelProperty(value = "还车时间")
			@ExcelColumn(name="还车时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date backDate;

			@ApiModelProperty(value = "还车指令编码")
			@@ -131,7 +141,7 @@

			@ApiModelProperty(value = "结算时间")
			@ExcelColumn(name="结算时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date closeDate;

			@ApiModelProperty(value = "结算状态 0未结算 1已结束", example = "1")