From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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..8d0234f 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;
@@ -42,7 +45,7 @@
@ExcelColumn(name="璁¤垂鏃堕暱锛堝垎)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
private Integer duration;
- @ApiModelProperty(value = "绉熻溅鏃堕棿"))
+ @ApiModelProperty(value = "绉熻溅鏃堕棿")
@ExcelColumn(name="绉熻溅鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
private Date rentDate;
@@ -50,4 +53,18 @@
@ExcelColumn(name="杩樿溅鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER)
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