From 687d0fc2de844e09864cc2ea2b24550069a50546 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 16:00:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java b/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
index a626043..d151067 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
@@ -31,14 +31,23 @@
@ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
private Integer status;
- @ApiModelProperty(value = "鍊熷嚭鏃堕棿璧峰")
- private Date rentDateStart;
-
- @ApiModelProperty(value = "鍊熷嚭鏃堕棿缁撴潫")
- private Date rentDateEnd;
+// @ApiModelProperty(value = "鍊熷嚭鏃堕棿璧峰")
+// private Date rentDateStart;
+//
+// @ApiModelProperty(value = "鍊熷嚭鏃堕棿缁撴潫")
+// private Date rentDateEnd;
@ApiModelProperty(value = "鏄惁褰掕繕 [杞﹁締鍙栬繕璁板綍(绔欑偣) 鍏ュ弬]")
private Boolean hasBack;
@ApiModelProperty(value = "缁撶畻璁㈠崟鍙�")
private String goodsorderId;
+
+ @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
+ private Integer backType;
+
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿璧峰")
+ private Date startDate;
+
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿缁撴潫")
+ private Date endDate;
}
--
Gitblit v1.9.3