productDev/parkBike.git

			@@ -103,6 +103,8 @@
			private String closeUserId;
			@ApiModelProperty(value = "结算类型 0用户自行结算 1平台人工强制结算 2系统自动结算")
			private Integer closeType;
			@ApiModelProperty(value = "结算车型编码")
			private String paramId;
			@ApiModelProperty(value = "用户openid" )
			@TableField(exist = false)
			@ExcelColumn(name="用户",index = 1 ,width = 10,align = HorizontalAlignment.CENTER)
			@@ -123,11 +125,12 @@
			@ExcelColumn(name="退押金(元)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
			private BigDecimal refundMoney;
			@ApiModelProperty(value = "骑行卡抵扣(分）")
			@ExcelColumn(name="优惠金额",index = 10,width = 10,align = HorizontalAlignment.CENTER)
			@TableField(exist = false)
			private BigDecimal discountMoney;
			@ApiModelProperty(value = "最后退款时间")
			@TableField(exist = false)
			@ExcelColumn(name="退款结算时间",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
			@ExcelColumn(name="退款时间",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
			private Date refundDate;
			@ApiModelProperty(value = "最近骑行状态")
			@TableField(exist = false)
			@@ -137,7 +140,6 @@
			private Integer closeStatus;

			@ApiModelProperty(value = "操作人")
			@ExcelColumn(name="操作人",index = 9,width = 10,align = HorizontalAlignment.CENTER)
			@TableField(exist = false)
			private String refundUserName;

			@@ -145,4 +147,9 @@
			@TableField(exist = false)
			private String discountName;

			@ApiModelProperty(value = "骑行类型")
			@ExcelColumn(name="订单类型",index = 11,width = 10,valueMapping = "3=单车类型;4=电车类型;",align = HorizontalAlignment.CENTER)
			@TableField(exist = false)
			private Integer bikeType;

			}