From 3726375e0ae995404a76838f18bd5f40081a4412 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 06 十一月 2023 18:42:24 +0800
Subject: [PATCH] # 导出字段调整 登陆提示
---
server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
index 5c8d7c5..77ca66a 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
@@ -13,7 +13,7 @@
import java.math.BigDecimal;
/**
- *
+ *
* @author 姹熻箘韫�
* @date 2023/09/27 18:08
*/
@@ -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 = "閫�娆剧姸鎬�")
--
Gitblit v1.9.3