From 59bfd0b8bbbf0ee94ec68e4a3a1a6e536d0ad8fd Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java b/server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java
index 1466f5e..ca23c55 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java
@@ -47,15 +47,21 @@
@ExcelColumn(name = "浼樻儬鍒告姌鎵�(鍏�)", index = 12)
private String deductionAmount;
- @ExcelColumn(name = "璁㈠崟鐘舵��", index = 13)
+ @ExcelColumn(name = "闂ㄥ簵琛ュ伩璐圭敤(鍏�)", index = 13)
+ private String shopCompensationAmount;
+
+ @ExcelColumn(name = "鍙告満琛ュ伩璐圭敤(鍏�)", index = 14)
+ private String exceptionFee;
+
+ @ExcelColumn(name = "璁㈠崟鐘舵��", index = 15)
private String statusDesc;
- @ExcelColumn(name = "缁撶畻鐘舵��", index = 14)
+ @ExcelColumn(name = "缁撶畻鐘舵��", index = 16)
private String settlementDesc;
- @ExcelColumn(name = "鏀粯鏃堕棿", index = 15, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 16)
+ @ExcelColumn(name = "鏀粯鏃堕棿", index = 17, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 16)
private Date payTime;
- @ExcelColumn(name = "鍒涘缓鏃堕棿", index = 16, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 16)
+ @ExcelColumn(name = "鍒涘缓鏃堕棿", index = 18, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 16)
private Date createTime;
}
--
Gitblit v1.9.3