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/MemberRidesResponse.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
index fc9d167..b8d9078 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
@@ -29,12 +29,20 @@
     @ApiModelProperty(value = "楠戣缁撴潫鏃堕棿")
     private Date rideEndTime;
 
+    @ApiModelProperty(value = "楠戣寮�濮嬫椂闂�-鐭椂闂�")
+    private String rideStartTimeStr;
+
+    @ApiModelProperty(value = "楠戣缁撴潫鏃堕棿-鐭椂闂�")
+    private String rideEndTimeStr;
+
     @ApiModelProperty(value = "楠戣鏃堕暱")
     private Integer rideTime;
 
     @ApiModelProperty(value = "璁¤垂鏃堕暱")
     private Integer duration;
 
+    @ApiModelProperty(value = "璁′环瑙勫垯")
+    private String priceRole;
     @ApiModelProperty(value = "杞﹀瀷")
     private String bikeType;
 

--
Gitblit v1.9.3