productDev/parkBike.git

			@@ -29,7 +29,7 @@
			private String pid;

			@ApiModelProperty(value = "交易时间")
			@ExcelColumn(name="交易时间",width = 10,align = HorizontalAlignment.CENTER)
			@ExcelColumn(name="支付时间",index = 4,width = 10,align = HorizontalAlignment.CENTER, dateFormat = "yyyy-MM-dd HH:mm:ss")
			//@JsonFormat(pattern = "yyyy-MM-dd")
			private Date billDate;

			@@ -46,15 +46,15 @@
			private String deviceInfo;

			@ApiModelProperty(value = "微信交易号")
			@ExcelColumn(name="微信交易号",width = 10,align = HorizontalAlignment.CENTER)
			@ExcelColumn(name="微信交易号",index = 3, width = 10,align = HorizontalAlignment.CENTER)
			private String transactionId;

			@ApiModelProperty(value = "商户订单号")
			@ExcelColumn(name="订单编号",width = 10,align = HorizontalAlignment.CENTER)
			@ExcelColumn(name="订单编号", index = 2,width = 10,align = HorizontalAlignment.CENTER)
			private String outTradeNo;

			@ApiModelProperty(value = "用户标识")
			@ExcelColumn(name="用户",width = 10,align = HorizontalAlignment.CENTER)
			@ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
			private String openid;

			@ApiModelProperty(value = "交易类型")
			@@ -70,7 +70,7 @@
			private String feeType;

			@ApiModelProperty(value = "应结订单金额", example = "1")
			@ExcelColumn(name="交易金额",width = 10,align = HorizontalAlignment.CENTER)
			@ExcelColumn(name="支付金额",index = 5, width = 10,align = HorizontalAlignment.CENTER)
			private BigDecimal settlementTotalFee;

			@ApiModelProperty(value = "代金券金额", example = "1")
			@@ -83,6 +83,7 @@
			private String outRefundNo;

			@ApiModelProperty(value = "退款金额", example = "1")
			@ExcelColumn(name="退款金额",index = 6, width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
			private BigDecimal refundFee;

			@ApiModelProperty(value = "充值券退款金额", example = "1")
			@@ -95,6 +96,7 @@
			private Date refundApplyDate;

			@ApiModelProperty(value = "退款成功时间")
			@ExcelColumn(name="退款时间",index = 6, width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
			private Date refundSuccessDate;

			@ApiModelProperty(value = "退款状态")