From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java | 12 ++++++++++++
1 files changed, 12 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 b8d9078..a9fb0b5 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.business.model.DiscountMember;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -43,11 +44,18 @@
@ApiModelProperty(value = "璁′环瑙勫垯")
private String priceRole;
+
@ApiModelProperty(value = "杞﹀瀷")
private String bikeType;
@ApiModelProperty(value = "缂栧彿")
private String bikeCode;
+
+ @ApiModelProperty(value = "璁㈠崟绫诲瀷锛�0=鑷杞﹁鍗曪紱1=鐢佃溅璁㈠崟")
+ private Integer ridesType;
+
+ @ApiModelProperty(value = "鐢甸噺鐘舵�侊細0=鐢甸噺鍏呰冻锛�1=鐢甸噺浣�")
+ private Integer voltageStatus;
@ApiModelProperty(value = "璧锋浠�", example = "1")
private BigDecimal basePrice;
@@ -63,4 +71,8 @@
@ApiModelProperty(value = "楠戣璁板綍涓婚敭")
private String rideId;
+
+ @ApiModelProperty(value = "濂楅鍗′俊鎭�")
+ private DiscountMember discountMember;
+
}
--
Gitblit v1.9.3