From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化

---
 server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
index 2b678ec..a346c3a 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -26,15 +27,18 @@
     @ExcelColumn(name="杞﹁締缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
     private String bikeCode;
 
+    @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+    private Integer type;
     @ApiModelProperty(value = "杞﹁締绫诲瀷")
     @ExcelColumn(name="杞﹁締绫诲瀷",index = 3,width = 10,align = HorizontalAlignment.CENTER)
     private String bikeType;
-
+    @ApiModelProperty(value = "濂楅鎶垫墸浠锋牸锛堝垎锛�")
+    private BigDecimal discountPrice;
     @ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
     private Integer closeStatus;
 
     @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞�  3寮�閿佸け璐�")
-    @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
+//    @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
     private Integer status;
 
     @ApiModelProperty(value = "楠戣鏃堕暱")
@@ -46,11 +50,11 @@
     private Integer duration;
 
     @ApiModelProperty(value = "绉熻溅鏃堕棿")
-    @ExcelColumn(name="绉熻溅鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="绉熻溅鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date rentDate;
 
     @ApiModelProperty(value = "杩樿溅鏃堕棿")
-    @ExcelColumn(name="杩樿溅鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="杩樿溅鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date backDate;
 
     @ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜")

--
Gitblit v1.9.3