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 | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 83fc050..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 long rideTime;
+ private Integer rideTime;
@ApiModelProperty(value = "璁¤垂鏃堕暱")
- private long duration;
+ private Integer duration;
+ @ApiModelProperty(value = "璁′环瑙勫垯")
+ private String priceRole;
@ApiModelProperty(value = "杞﹀瀷")
private String bikeType;
@@ -47,9 +55,12 @@
@ApiModelProperty(value = "璧锋浠锋椂闂�", example = "1")
private Integer baseTime;
- @ApiModelProperty(value = "瓒呭嚭鍗曚环", example = "1")
- private Integer unitPrice;
+ @ApiModelProperty(value = "瓒呭嚭鍗曚环")
+ private BigDecimal unitPrice;
- @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅", example = "1")
+ @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅")
private Integer unitTime;
+
+ @ApiModelProperty(value = "楠戣璁板綍涓婚敭")
+ private String rideId;
}
--
Gitblit v1.9.3