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/web/response/MemberRidesDTO.java | 25 +++++++++++++++++++++----
1 files changed, 21 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 9452341..3600841 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
@@ -15,6 +15,9 @@
@ApiModel("楠戣璁板綍杩斿洖")
public class MemberRidesDTO {
+ @ApiModelProperty(value = "缂栫爜")
+ private String id;
+
@ApiModelProperty(value = "鐢ㄦ埛OpenID")
@ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
private String openid;
@@ -31,7 +34,7 @@
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 = "楠戣鏃堕暱")
@@ -42,12 +45,26 @@
@ExcelColumn(name="璁¤垂鏃堕暱锛堝垎)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
private Integer duration;
- @ApiModelProperty(value = "绉熻溅鏃堕棿"))
- @ExcelColumn(name="绉熻溅鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
+ @ApiModelProperty(value = "绉熻溅鏃堕棿")
+ @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 = "绉熻溅绔欑偣缂栫爜")
+ private String rentSiteId;
+
+ @ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜")
+ private String rentLockId;
+
+
+ @ApiModelProperty(value = "杩樿溅绔欑偣缂栫爜")
+// @ExcelColumn(name="褰掕繕绔欑偣",index = 7,width = 10,align = HorizontalAlignment.CENTER)
+ private String backSiteId;
+
+ @ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
+// @ExcelColumn(name="褰掕繕閿佸叿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
+ private String backLockId;
}
--
Gitblit v1.9.3