productDev/parkBike.git

			@@ -37,7 +37,6 @@
			private String editor;

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

			@ApiModelProperty(value = "备注")
			@@ -73,7 +72,7 @@

			@ApiModelProperty(value = "租车锁头编码")
			@ExcelColumn(name="租车锁具",index = 5,width = 10,align = HorizontalAlignment.CENTER)
			private String rentLockId;
			private Integer rentLockId;

			@ApiModelProperty(value = "租车时间")
			@ExcelColumn(name="租车时间",index = 6,width = 10,align = HorizontalAlignment.CENTER)
			@@ -88,7 +87,7 @@

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

			@ApiModelProperty(value = "还车时间")
			private Date backDate;
			@@ -136,7 +135,7 @@
			private String pricingDetailId;

			@ApiModelProperty(value = "是否节假日 0不是 1是")
			private String isHoliday;
			private Integer isHoliday;


			@ApiModelProperty(value = "还车类型 0正常还车 1强制还车")
			@@ -151,4 +150,11 @@
			@ApiModelProperty(value = "强制还车操作人(关联system_user)")
			private String backUserid;

			@ApiModelProperty(value = "骑行时长")
			@TableField(exist = false)
			private Integer rideTime;
			@ApiModelProperty(value = "排序码（升序）", example = "1")
			@TableField(exist = false)
			private Integer sortnum;

			}