From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java |   17 ++++++++++++++---
 1 files changed, 14 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 3912cdc..ed5a011 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
@@ -13,6 +13,9 @@
 @Data
 public class BikeLogDTO {
 
+    @ApiModelProperty(value = "缂栫爜")
+    private String id;
+
     @ApiModelProperty(value = "鐢ㄦ埛OpenID")
     @ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
     private String openid;
@@ -34,14 +37,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 = "杩樿溅绔欑偣")
@@ -53,6 +56,14 @@
     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;
+
+    @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞�  3寮�閿佸け璐�")
+//    @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,width = 10,align = HorizontalAlignment.CENTER)
+    private Integer status;
+
+    @ApiModelProperty(value = "缁撶畻鐘舵��")
+//    @ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,width = 10,align = HorizontalAlignment.CENTER)
+    private Integer closeStatus;
 }

--
Gitblit v1.9.3