From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java b/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
index 98e14d1..833b402 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
@@ -22,14 +22,17 @@
public class RefundPlatExportVO {
+ @ApiModelProperty(value = "缂栫爜")
+// @ExcelColumn(name="绯荤粺鍗曞彿",width = 10,index = 2,align = HorizontalAlignment.CENTER)
+ private String id;
@ApiModelProperty(value = "鐢ㄦ埛")
@ExcelColumn(name="鐢ㄦ埛" ,width = 10,index = 1,align = HorizontalAlignment.CENTER)
private String openid;
- @ApiModelProperty(value = "缂栫爜")
+ @ApiModelProperty(value = "绯荤粺鍗曞彿")
@ExcelColumn(name="绯荤粺鍗曞彿",width = 10,index = 2,align = HorizontalAlignment.CENTER)
- private String id;
+ private String objId;
@ApiModelProperty(value = "閫�娆句氦鏄撳崟鍙�")
@ExcelColumn(name="閫�娆句氦鏄撳崟鍙�" ,width = 10,index = 3,align = HorizontalAlignment.CENTER)
@@ -48,7 +51,7 @@
private BigDecimal money;
@ApiModelProperty(value = "鎿嶄綔鏃堕棿")
- @ExcelColumn(name="鎿嶄綔鏃堕棿" ,width = 10,index = 7,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鎿嶄綔鏃堕棿" ,width = 10,index = 7,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date doneDate;
@ApiModelProperty(value = "鎿嶄綔浜�")
--
Gitblit v1.9.3