From 17a004b47eb77af0a9b2cce4e797a59e17d4add6 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 23 十月 2023 16:39:11 +0800
Subject: [PATCH] # 到处字段调整 配置数据启用逻辑 价格配置文案调整

---
 server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
index 2f60567..7a81e97 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
@@ -34,11 +34,14 @@
     private String rentLockId;
 
     @ApiModelProperty(value = "楠戣鏃堕暱")
-    @ExcelColumn(name="楠戣鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="鍊熷嚭鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
     private Integer rideTime;
+    @ApiModelProperty(value = "璁¤垂鏃堕暱")
+//    @ExcelColumn(name="璁¤垂鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
+    private Integer duration;
 
     @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 rentDate;
 
     @ApiModelProperty(value = "杩樿溅绔欑偣")
@@ -50,6 +53,6 @@
     private String backLockId;
 
     @ApiModelProperty(value = "杩樿溅鏃堕棿")
-    @ExcelColumn(name="杩樿溅鏃堕棿",index = 14,width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="褰掕繕鏃堕棿",index = 14,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date backDate;
 }

--
Gitblit v1.9.3